From ebe1d7c33678391e6e44f2c38c1ddc69c32d6cfb Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 3 Jul 2020 13:37:22 +0100
Subject: [PATCH] Reset matrix-js-sdk back to develop branch

---
 package.json |  2 +-
 yarn.lock    | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 983d8e0616..cc90ace8e3 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "browser-request": "^0.3.3",
     "gfm.css": "^1.1.2",
     "highlight.js": "^9.13.1",
-    "matrix-js-sdk": "7.1.0",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "matrix-react-sdk": "2.9.0",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
     "postcss-easings": "^2.0.0",
diff --git a/yarn.lock b/yarn.lock
index 611f7b5dd6..67cec34764 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6988,6 +6988,20 @@ matrix-js-sdk@7.1.0:
     request "^2.88.0"
     unhomoglyph "^1.0.2"
 
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
+  version "7.1.0"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/2a688bdac828dc62916437d83c72cef1e525d5f9"
+  dependencies:
+    "@babel/runtime" "^7.8.3"
+    another-json "^0.2.0"
+    browser-request "^0.3.3"
+    bs58 "^4.0.1"
+    content-type "^1.0.2"
+    loglevel "^1.6.4"
+    qs "^6.5.2"
+    request "^2.88.0"
+    unhomoglyph "^1.0.2"
+
 matrix-mock-request@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8"