Merge branch 'develop' into release-v0.9.1

This commit is contained in:
David Baker 2016-12-09 20:03:10 +00:00
commit 93b3857a9b
44 changed files with 169 additions and 14 deletions

View file

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