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

2017-08-24 13:01:02 +00:00 · 2017-08-24 13:01:02 +00:00 · 2270f801ad
parent 2aedfde9fe a65196ee8c
commit 2270f801ad
1 changed files with 1 additions and 1 deletions
--- a/package.json
+++ b/package.json
@ -151,7 +151,7 @@
  "build": {
    "appId": "im.riot.app",
    "category": "Network",
-    "electronVersion": "1.6.8",
+    "electronVersion": "1.7.5",
    "//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
    "asar": false,
    "dereference": true,