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

This commit is contained in:
David Baker 2017-04-10 16:55:02 +01:00
commit ea0c41a9f8
7 changed files with 19 additions and 5 deletions

View file

@ -138,7 +138,7 @@
"build": {
"appId": "im.riot.app",
"category": "Network",
"electronVersion": "1.4.14",
"electronVersion": "1.6.2",
"//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
"asar": false,
"dereference": true,