From 10a8d0654688ada8ea90c8a60805c5a9d67156ad Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 14 Sep 2021 16:04:22 +0100
Subject: [PATCH] Upgrade matrix-js-sdk to 12.5.0

---
 package.json |  2 +-
 yarn.lock    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 099cf2e72f..76d0eb3faf 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "highlight.js": "^10.5.0",
     "jsrsasign": "^10.2.0",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "12.5.0-rc.1",
+    "matrix-js-sdk": "12.5.0",
     "matrix-react-sdk": "3.30.0-rc.2",
     "matrix-widget-api": "^0.1.0-beta.16",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index 86a27abddd..cdced2a990 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7672,6 +7672,22 @@ mathml-tag-names@^2.1.3:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
+matrix-js-sdk@12.5.0:
+  version "12.5.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.5.0.tgz#3899f9d323c457d15a1fe436a2dfa07ae131cce2"
+  integrity sha512-HnEXoEhqpNp9/W9Ep7ZNZAubFlUssFyVpjgKfMOxxg+dYbBk5NWToHmAPQxlRUgrZ/rIMLVyMJROSCIthDbo2A==
+  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"
+    p-retry "^4.5.0"
+    qs "^6.9.6"
+    request "^2.88.2"
+    unhomoglyph "^1.0.6"
+
 matrix-js-sdk@12.5.0-rc.1:
   version "12.5.0-rc.1"
   resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.5.0-rc.1.tgz#138155239b4be38ca706663ca0f2739aab41f1db"