Merge branch 'master' into exclude-private-modules

mixu · Dec 12, 2015 · 24eb90a · 24eb90a
2 parents f8b876b + f9a8b5d
commit 24eb90a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 /test/tmp/node_modules/
 db/
 test/tmp/*
-.settings
+.settings
+.vscode