From 4548831ac506a46e405dc9b3d45e5041e6be1d7f Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 4 Mar 2020 13:07:45 +0000
Subject: [PATCH] Reset matrix-js-sdk back to develop branch

---
 package.json | 14 +++++++++-----
 yarn.lock    |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 1a99b4b303..cdf9e813f4 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
     "gfm.css": "^1.1.2",
     "highlight.js": "^9.13.1",
-    "matrix-js-sdk": "5.1.0",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "matrix-react-sdk": "2.2.1",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
     "postcss-easings": "^2.0.0",
@@ -189,10 +189,14 @@
       "app": "electron_app"
     },
     "afterSign": "scripts/electron_afterSign.js",
-      "protocols": [{
-          "name": "riot",
-          "schemes": ["riot"]
-      }]
+    "protocols": [
+      {
+        "name": "riot",
+        "schemes": [
+          "riot"
+        ]
+      }
+    ]
   },
   "jest": {
     "modulePathIgnorePatterns": [
diff --git a/yarn.lock b/yarn.lock
index 7c58bbdb6c..4b899a3134 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7499,7 +7499,7 @@ mathml-tag-names@^2.1.1:
 
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "5.1.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/da96765020b632deb5b433077827a4f4a64e16e9"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/bc53f8fdec7222b6ca44a63cafbc7ae8c4cc396f"
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"
@@ -7550,7 +7550,7 @@ matrix-react-sdk@2.2.1:
     is-ip "^2.0.0"
     linkifyjs "^2.1.6"
     lodash "^4.17.14"
-    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
+    matrix-js-sdk "5.1.0"
     minimist "^1.2.0"
     pako "^1.0.5"
     png-chunks-extract "^1.0.0"