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

2019-01-17 10:16:34 +00:00 · 2019-01-17 10:16:34 +00:00 · e0b4875615
parent bbfd1448c5 3236f72031
commit e0b4875615
2 changed files with 2 additions and 2 deletions
--- a/package.json
+++ b/package.json
@ -150,7 +150,7 @@
  },
  "build": {
    "appId": "im.riot.app",
-    "electronVersion": "3.0.10",
+    "electronVersion": "4.0.1",
    "files": [
      "node_modules/**",
      "src/**",
--- a/src/vector/rageshakesetup.js
+++ b/src/vector/rageshakesetup.js
@ -26,7 +26,7 @@ limitations under the License.
 */

 import rageshake from "matrix-react-sdk/lib/rageshake/rageshake";
-import SdkConfig from "matrix-react-sdk/src/SdkConfig";
+import SdkConfig from "matrix-react-sdk/lib/SdkConfig";

 function initRageshake() {
    rageshake.init().then(() => {