Merge branch 'master' into develop

2021-01-26 12:08:24 +00:00
parent e327551399 982c3ceca1
commit e21514cea0
3 changed files with 12 additions and 5 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
-  "version": "3.12.0",
+  "version": "3.12.1",
  "description": "SDK for matrix.org using React",
  "author": "matrix.org",
  "repository": {
@@ -81,7 +81,7 @@
    "katex": "^0.12.0",
    "linkifyjs": "^2.1.9",
    "lodash": "^4.17.19",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "9.5.1",
    "matrix-widget-api": "0.1.0-beta.11",
    "minimist": "^1.2.5",
    "pako": "^1.0.11",