Merge remote-tracking branch 'origin/develop' into release-v0.12.7

2017-10-13 16:33:55 +01:00
parent adceda7588 d1476e0cc7
commit 3b2650e5ea
2 changed files with 6 additions and 1 deletions
@@ -152,7 +152,7 @@
  "build": {
    "appId": "im.riot.app",
    "category": "Network",
-    "electronVersion": "1.7.5",
+    "electronVersion": "1.7.9",
    "//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
    "asar": false,
    "dereference": true,