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

This commit is contained in:
Weblate 2017-08-24 13:01:02 +00:00
commit 2270f801ad

View File

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