Merge branch 'develop' into release-v0.15.4

This commit is contained in:
David Baker 2018-05-24 18:26:02 +01:00
commit cd9821f87e

View file

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