Merge branch 'master' into develop

2020-11-23 16:40:45 +00:00
parent f0fdfd53d2 5ca18590af
commit 8239649a45
3 changed files with 76 additions and 5 deletions
@@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
-  "version": "3.8.0",
+  "version": "3.9.0",
  "description": "SDK for matrix.org using React",
  "author": "matrix.org",
  "repository": {
@@ -78,7 +78,7 @@
    "is-ip": "^2.0.0",
    "linkifyjs": "^2.1.9",
    "lodash": "^4.17.19",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "9.2.0",
    "matrix-widget-api": "^0.1.0-beta.9",
    "minimist": "^1.2.5",
    "pako": "^1.0.11",