Merge remote-tracking branch 'upstream/master' into ELECTRON-308

This commit is contained in:
kiranniranjan 2018-02-19 10:58:13 +05:30
commit bd48118b89

View File

@ -84,7 +84,7 @@
"devDependencies": {
"browserify": "^14.1.0",
"cross-env": "^3.2.4",
"electron": "^1.7.12",
"electron": "^1.8.2",
"electron-builder": "^13.9.0",
"electron-builder-squirrel-windows": "^12.3.0",
"electron-packager": "^8.5.2",