Merge remote-tracking branch 'mattermost/master' into auto-updater

2018-10-16 00:28:47 +09:00
parent a5311e7f72 2c9a816942
commit ccdfbae3b2
31 changed files with 888 additions and 447 deletions
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
    "cross-env": "^5.1.6",
    "css-loader": "^0.28.11",
    "devtron": "^1.4.0",
-    "electron": "2.0.2",
+    "electron": "2.0.8",
    "electron-builder": "20.14.7",
    "electron-builder-squirrel-windows": "~20.14.0",
    "electron-connect": "^0.6.3",