From 86b0f898ecd899b568df16ec2ebd30fac8775482 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 26 Jan 2021 12:29:16 +0000
Subject: [PATCH] Reset matrix-js-sdk back to develop branch

---
 package.json |  2 +-
 yarn.lock    | 23 ++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index a7cd09f849..1ab17522a4 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "highlight.js": "^10.4.1",
     "jsrsasign": "^9.1.5",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "9.5.1",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "matrix-react-sdk": "3.12.1",
     "matrix-widget-api": "0.1.0-beta.11",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
diff --git a/yarn.lock b/yarn.lock
index 436f7b32c9..92298e5044 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7919,6 +7919,20 @@ matrix-js-sdk@9.5.1:
     request "^2.88.2"
     unhomoglyph "^1.0.6"
 
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
+  version "9.5.1"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/7cfbd0da95edc66671e166aa83145b5e17ca76fc"
+  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"
+    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"
@@ -7960,6 +7974,8 @@ matrix-react-sdk@3.12.1:
     linkifyjs "^2.1.9"
     lodash "^4.17.19"
     matrix-js-sdk "9.5.1"
+    matrix-widget-api "^0.1.0-beta.10"
+    minimist "^1.2.5"
     pako "^1.0.11"
     parse5 "^5.1.1"
     png-chunks-extract "^1.0.0"
@@ -7988,7 +8004,7 @@ matrix-react-test-utils@^0.2.2:
   resolved "https://registry.yarnpkg.com/matrix-react-test-utils/-/matrix-react-test-utils-0.2.2.tgz#c87144d3b910c7edc544a6699d13c7c2bf02f853"
   integrity sha512-49+7gfV6smvBIVbeloql+37IeWMTD+fiywalwCqk8Dnz53zAFjKSltB3rmWHso1uecLtQEcPtCijfhzcLXAxTQ==
 
-matrix-widget-api@0.1.0-beta.11, matrix-widget-api@^0.1.0-beta.10:
+matrix-widget-api@0.1.0-beta.11:
   version "0.1.0-beta.11"
   resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.11.tgz#3658e244bf82eebea36e64475ebfce86b778b476"
   integrity sha512-RxIghopRKTQdmYMJzZg/QR+wcPcKe9S1pZZ31zN/M1LKsvTLThBYdMcP1idKh7MkhpO9eCdCVjJOMJTrqxNzbQ==
@@ -10239,6 +10255,11 @@ qs@^6.9.4:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.4.tgz#9090b290d1f91728d3c22e54843ca44aea5ab687"
   integrity sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==
 
+qs@^6.9.6:
+  version "6.9.6"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee"
+  integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==
+
 qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"