Merge remote-tracking branch 'ups/master' into 484_truecolor_2

xtermjs · Jul 30, 2017 · b94d8a2 · b94d8a2
2 parents fbbd664 + bcff69b
commit b94d8a2
Show file tree

Hide file tree

Showing 10 changed files with 1,309 additions and 1,060 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ npm-debug.log
 .env
 build/
 .vscode/
+.DS_Store
 
 # Directories needed for code coverage
 /coverage/