Merge branch 'develop' into release-v0.9.1
This commit is contained in:
commit
93b3857a9b
44 changed files with 169 additions and 14 deletions
|
@ -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,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue