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

This commit is contained in:
Weblate 2018-05-18 10:47:08 +00:00
commit 3bd97650dc

View file

@ -144,7 +144,7 @@
"build": { "build": {
"appId": "im.riot.app", "appId": "im.riot.app",
"category": "Network", "category": "Network",
"electronVersion": "2.0.0", "electronVersion": "2.0.1",
"//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,