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

This commit is contained in:
Weblate 2018-04-25 14:00:54 +00:00
commit cb51ad929e

View File

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