From f8e84c42ad058104567025c12e8138242ed218b8 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 12 Oct 2020 13:59:58 +0100
Subject: [PATCH] Reset matrix-react-sdk back to develop branch

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

diff --git a/package.json b/package.json
index 6405b1f14b..c030f45a53 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "highlight.js": "^9.13.1",
     "jsrsasign": "^9.1.5",
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-    "matrix-react-sdk": "3.6.0",
+    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
     "matrix-widget-api": "^0.1.0-beta.2",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index d0b3b7b937..d7beb0cc88 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7898,21 +7898,6 @@ mathml-tag-names@^2.1.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@8.5.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.5.0.tgz#02d77e0e95fe32dcc74e0a94707f9103badfdca5"
-  integrity sha512-RJCqK/QkesL+63rX4C4mShEFw/ZR20D1UMw1RKY8pQhv1/7Skz+v5BTv/UCqG45E3rRYMarNOwy13CZ+yq33FA==
-  dependencies:
-    "@babel/runtime" "^7.11.2"
-    another-json "^0.2.0"
-    browser-request "^0.3.3"
-    bs58 "^4.0.1"
-    content-type "^1.0.4"
-    loglevel "^1.7.0"
-    qs "^6.9.4"
-    request "^2.88.2"
-    unhomoglyph "^1.0.6"
-
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "8.5.0"
   resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/d8c4101fdd521e189f4755c6f02a8971b991ef5f"
@@ -7935,10 +7920,9 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-matrix-react-sdk@3.6.0:
+"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
   version "3.6.0"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.6.0.tgz#fbac180f8a8681bd7ca80de915dc25bf225fdac8"
-  integrity sha512-14/Qo6zS6daPtNNVVhL2Uk6Z/k/KWGw4fsE3U4aVA1dupyOaPnEvPAjkvuRh3kzRI8b5sjXJvQCL/tuoxeInLg==
+  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/d007b06d7c245354c126e9ab41c8b4b3f8b85f54"
   dependencies:
     "@babel/runtime" "^7.10.5"
     await-lock "^2.0.1"
@@ -7965,7 +7949,7 @@ matrix-react-sdk@3.6.0:
     is-ip "^2.0.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.19"
-    matrix-js-sdk "8.5.0"
+    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
     matrix-widget-api "^0.1.0-beta.3"
     minimist "^1.2.5"
     pako "^1.0.11"