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

This commit is contained in:
J. Ryan Stinnett
2020-07-15 10:44:25 +01:00
5 changed files with 174 additions and 38 deletions

View File

@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element (Riot)",
"main": "src/electron-main.js",
"version": "1.6.6",
"version": "1.6.8",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@@ -52,7 +52,7 @@
"mkdirp": "^1.0.3",
"needle": "^2.5.0",
"node-pre-gyp": "^0.15.0",
"npm": "^6.13.7",
"npm": "^6.14.6",
"rimraf": "^3.0.2",
"semver": "^7.1.3",
"tar": "^6.0.1"
@@ -63,7 +63,7 @@
},
"build": {
"appId": "im.riot.app",
"electronVersion": "9.0.4",
"electronVersion": "9.0.5",
"files": [
"package.json",
{