From 55fe24e72c9d14a60d78cb4c76117326842df1d5 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 1 Oct 2019 11:47:44 +0100
Subject: [PATCH] Upgrade to React SDK 1.6.1 and JS SDK 2.4.1

---
 package.json |  4 ++--
 yarn.lock    | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index ea37c9f033..343d889a31 100644
--- a/package.json
+++ b/package.json
@@ -74,8 +74,8 @@
     "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
     "gfm.css": "^1.1.2",
     "highlight.js": "^9.13.1",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+    "matrix-js-sdk": "2.4.1",
+    "matrix-react-sdk": "1.6.1",
     "modernizr": "^3.6.0",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index 5ce395c3dd..414b0c28ee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5947,9 +5947,10 @@ math-random@^1.0.1:
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
   integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "2.4.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/562bf9331bd5ee8701625cd9632c8e73374b18f4"
+matrix-js-sdk@2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.1.tgz#f32f8ebb1f01fa26711a4cf6b78eae125156f455"
+  integrity sha512-5mOp396eOtvaMiuUD85TWvuxSP532PuvtH/QLugBGenI15FGwtnC40cTnVYviYWGBi340FPrOKWulc5ILRX6qQ==
   dependencies:
     another-json "^0.2.0"
     babel-runtime "^6.26.0"
@@ -5970,9 +5971,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 "1.6.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/9221dcd1544b9cb540971dee5ea260372e873fbf"
+matrix-react-sdk@1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.6.1.tgz#37608f7e6ecf5d8a57411c0e2d63e516f897f42c"
+  integrity sha512-+hjM+aGU/Rc39Ebu/SONLX8XJ/Y1Ig7uEOGTV5R+BJMRlLtpK/rYwJk24tpn1LiVMhPU5HJCApnmvpBv3Xo/GQ==
   dependencies:
     babel-plugin-syntax-dynamic-import "^6.18.0"
     babel-runtime "^6.26.0"
@@ -6003,7 +6005,7 @@ matrix-mock-request@^1.2.3:
     linkifyjs "^2.1.6"
     lodash "^4.17.14"
     lolex "4.2"
-    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
+    matrix-js-sdk "2.4.1"
     optimist "^0.6.1"
     pako "^1.0.5"
     png-chunks-extract "^1.0.0"