Merge remote-tracking branch 'origin/develop' into develop

2018-04-25 14:00:54 +00:00 · 2018-04-25 14:00:54 +00:00 · cb51ad929e
commit cb51ad929e
parent ff93ace4cc 83c20f5d5d
1 changed files with 1 additions and 1 deletions
--- a/package.json
+++ b/package.json
@ -140,7 +140,7 @@
  "build": {
    "appId": "im.riot.app",
    "category": "Network",
-    "electronVersion": "1.8.3",
+    "electronVersion": "1.8.4",
    "//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
    "asar": false,
    "dereference": true,