Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2019-11-04 15:51:46 +00:00
commit 3735dc9fa3

View file

@ -154,7 +154,7 @@
}, },
"build": { "build": {
"appId": "im.riot.app", "appId": "im.riot.app",
"electronVersion": "6.1.12", "electronVersion": "6.1.2",
"files": [ "files": [
"node_modules/**", "node_modules/**",
"src/**" "src/**"