From 2d03ccfa5796cb51e03960d83e3f904e09a12981 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 12 Oct 2020 13:40:53 +0100
Subject: [PATCH] Upgrade matrix-react-sdk to 3.6.0

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

diff --git a/package.json b/package.json
index 50e42a8dab..33ebec230b 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "highlight.js": "^9.13.1",
     "jsrsasign": "^9.1.5",
     "matrix-js-sdk": "8.5.0",
-    "matrix-react-sdk": "3.6.0-rc.1",
+    "matrix-react-sdk": "3.6.0",
     "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 bad242a078..08dff37951 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7913,21 +7913,6 @@ matrix-js-sdk@8.5.0:
     request "^2.88.2"
     unhomoglyph "^1.0.6"
 
-matrix-js-sdk@8.5.0-rc.1:
-  version "8.5.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.5.0-rc.1.tgz#7ad34d8b6a786a7d4a04173e3b17da56022cd62a"
-  integrity sha512-hVFYkN3/rsPiNXdFqcvRvg+Egr75qhPGMi2gp59PDr7JrZEtOACA0I3NCY1vPub9kXGTtPZqPuHGFrsF9qLXGw==
-  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-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"
@@ -7936,10 +7921,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-matrix-react-sdk@3.6.0-rc.1:
-  version "3.6.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.6.0-rc.1.tgz#fddce68a5b5fb14232236ba86587d07f2f859a38"
-  integrity sha512-ND0qxevqLdeb8jrrLroIusy5z0A3ILw4myEpp2SpkDtUChc6g2gcdvU7yjLOoJNySvfnWwDGio0lGxAshNI1bA==
+matrix-react-sdk@3.6.0:
+  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==
   dependencies:
     "@babel/runtime" "^7.10.5"
     await-lock "^2.0.1"
@@ -7966,8 +7951,8 @@ matrix-react-sdk@3.6.0-rc.1:
     is-ip "^2.0.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.19"
-    matrix-js-sdk "8.5.0-rc.1"
-    matrix-widget-api "^0.1.0-beta.2"
+    matrix-js-sdk "8.5.0"
+    matrix-widget-api "^0.1.0-beta.3"
     minimist "^1.2.5"
     pako "^1.0.11"
     parse5 "^5.1.1"
@@ -8002,6 +7987,11 @@ matrix-widget-api@^0.1.0-beta.2:
   resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.2.tgz#367da1ccd26b711f73fc5b6e02edf55ac2ea2692"
   integrity sha512-q5g5RZN+RRjM4HmcJ+LYoQAYrB1wzyERmoQ+LvKbTV/+9Ov36Kp0QEP8CleSXEd5WLp6bkRlt60axDaY6pWGmg==
 
+matrix-widget-api@^0.1.0-beta.3:
+  version "0.1.0-beta.3"
+  resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.3.tgz#356965ca357172ee056e3fd86fd96879b059a114"
+  integrity sha512-j7nxdhLQfdU6snsdBA29KQR0DmT8/vl6otOvGqPCV0OCHpq1312cP79Eg4JzJKIFI3A76Qha3nYx6G9/aapwXg==
+
 md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"