From fe32590e3052290b28d42772e4fff855c8a85449 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 14 May 2020 16:35:02 +0100
Subject: [PATCH] Upgrade matrix-react-sdk to 2.6.0-rc.1

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

diff --git a/package.json b/package.json
index f3467e860..babd0dd35 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "gfm.css": "^1.1.2",
     "highlight.js": "^9.13.1",
     "matrix-js-sdk": "6.1.0-rc.1",
-    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+    "matrix-react-sdk": "2.6.0-rc.1",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
     "postcss-easings": "^2.0.0",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index d5dd1bf43..943e65294 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6956,20 +6956,6 @@ matrix-js-sdk@6.1.0-rc.1:
     request "^2.88.0"
     unhomoglyph "^1.0.2"
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "6.0.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/f120533fadb309ac5dc8b2bcb6882e784ba93f18"
-  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"
@@ -6978,9 +6964,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
-  version "2.5.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/aa0c6f1f71a6122579c74f3cba3a7925f35131ac"
+matrix-react-sdk@2.6.0-rc.1:
+  version "2.6.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.6.0-rc.1.tgz#391b3972741871ab11d9e3491686d3af9e57e255"
+  integrity sha512-FPqZRx3aKrw0X2dGujBylGIk2mGvnBvbY+iuK7HigiOE0zrPZwj2fvgNnv535Q/9vvmD9w+ppjnY5cakG7o+KA==
   dependencies:
     "@babel/runtime" "^7.8.3"
     blueimp-canvas-to-blob "^3.5.0"
@@ -7007,7 +6994,7 @@ matrix-mock-request@^1.2.3:
     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 "6.1.0-rc.1"
     minimist "^1.2.0"
     pako "^1.0.5"
     parse5 "^5.1.1"