Merge branch 'master' into develop

yarn.lock

@@ -7541,9 +7541,10 @@ 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@github:matrix-org/matrix-js-sdk#develop":
-  version "9.11.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1dddcd49251f750cd2ff44e084c666290ffb17ad"
+matrix-js-sdk@10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-10.0.0.tgz#571e97c8d8351715ac609ccedd38cad79d0b752e"
+  integrity sha512-40QN9HITqWBSYi/e8QQidDL6UOhWBpst437i+lHIqQ8a7SQtbcquDSRXWR22BjM2qbssR+02zfrLI/Kez7IoBQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
     another-json "^0.2.0"
@@ -7563,9 +7564,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 "3.18.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/21e7847686a18f90b0b19ac72ca937055d948ba7"
+matrix-react-sdk@3.19.0:
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.19.0.tgz#45e5794f9dae9b8fd6bdc2862ffd6e3a6650e282"
+  integrity sha512-xCRtq0u+qyYIAU/rUt7oQU0+sQboT1q1RRBzEvKca2usQRFH+EV4ahh97GCgg+u2IDiYb83bcVPcB4lGcCVLjg==
   dependencies:
     "@babel/runtime" "^7.12.5"
     await-lock "^2.1.0"
@@ -7593,7 +7595,7 @@ matrix-mock-request@^1.2.3:
     katex "^0.12.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.20"
-    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
+    matrix-js-sdk "10.0.0"
     matrix-widget-api "^0.1.0-beta.13"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"