Merge branch 'master' into develop

2020-01-13 13:09:56 +00:00
parent dd652f6af3 8091cadc46
commit 389e1194ff
3 changed files with 196 additions and 5 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
-  "version": "1.7.5",
+  "version": "1.7.6",
  "description": "SDK for matrix.org using React",
  "author": "matrix.org",
  "repository": {
@@ -88,7 +88,7 @@
    "linkifyjs": "^2.1.6",
    "lodash": "^4.17.14",
    "lolex": "4.2",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "3.0.0",
    "optimist": "^0.6.1",
    "pako": "^1.0.5",
    "png-chunks-extract": "^1.0.0",