From 1200ae9c90273dd0cf0f4a59b9c5a3f453b372d0 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 1 Sep 2021 09:55:36 +0100
Subject: [PATCH] Reset matrix-js-sdk back to develop branch

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

diff --git a/package.json b/package.json
index de42579d77..56c5d0090d 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "highlight.js": "^10.5.0",
     "jsrsasign": "^10.2.0",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "12.4.0",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "matrix-react-sdk": "3.29.0",
     "matrix-widget-api": "^0.1.0-beta.15",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index 465909e24e..9efd741a18 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7688,6 +7688,21 @@ matrix-js-sdk@12.4.0:
     request "^2.88.2"
     unhomoglyph "^1.0.6"
 
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
+  version "12.4.0"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/2783d162b77d6629c574f35e88bea9ae29765c34"
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    another-json "^0.2.0"
+    browser-request "^0.3.3"
+    bs58 "^4.0.1"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    p-retry "^4.5.0"
+    qs "^6.9.6"
+    request "^2.88.2"
+    unhomoglyph "^1.0.6"
+
 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"