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

This commit is contained in:
David Baker 2016-11-30 18:13:14 +00:00
commit 4988f0603f
2 changed files with 14 additions and 5 deletions

View file

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