Merge branch 'master' into alt-selection

xtermjs · Jul 28, 2017 · 3f7fec8 · 3f7fec8
2 parents 3479614 + 34f075a
commit 3f7fec8
Show file tree

Hide file tree

Showing 8 changed files with 1,263 additions and 1,036 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/