Merge branch 'master' into develop

2019-12-09 11:43:27 +00:00
parent 7776b19339 cfb3258c36
commit b7f6d7b102
4 changed files with 54 additions and 5 deletions
@@ -6094,7 +6094,7 @@ matrix-mock-request@^1.2.3:
    linkifyjs "^2.1.6"
    lodash "^4.17.14"
    lolex "4.2"
-    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
+    matrix-js-sdk "2.4.6"
    optimist "^0.6.1"
    pako "^1.0.5"
    png-chunks-extract "^1.0.0"