Merge branch 'master' into atom-shell-electron

This commit is contained in:
Jeffrey Morgan
2015-04-17 11:26:01 -04:00

View File

@@ -38,6 +38,7 @@
"tty",
"net",
"crypto",
"babel",
"<rootDir>/node_modules/.*JSONStream",
"<rootDir>/node_modules/object-assign",
"<rootDir>/node_modules/underscore",