Merge branch 'master' into develop

2020-05-05 11:27:52 +01:00
parent ed455a966d 854855a5aa
commit 338486b561
3 changed files with 351 additions and 5 deletions
@@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
-  "version": "2.3.1",
+  "version": "2.5.0",
  "description": "SDK for matrix.org using React",
  "author": "matrix.org",
  "repository": {
@@ -79,7 +79,7 @@
    "is-ip": "^2.0.0",
    "linkifyjs": "^2.1.6",
    "lodash": "^4.17.14",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "6.0.0",
    "minimist": "^1.2.0",
    "pako": "^1.0.5",
    "parse5": "^5.1.1",