Merge branch 'master' into develop

2020-08-05 16:10:29 +01:00
parent 2f3eff4301 f8ed635fbf
commit f8cdd51fe3
3 changed files with 60 additions and 5 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
-  "version": "3.0.0",
+  "version": "3.1.0",
  "description": "SDK for matrix.org using React",
  "author": "matrix.org",
  "repository": {
@@ -79,7 +79,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": "8.0.1",
    "minimist": "^1.2.5",
    "pako": "^1.0.11",
    "parse5": "^5.1.1",