Merge branch 'master' into develop

2019-03-18 13:57:50 +00:00
parent 40920ae3c7 fc7db55585
commit 554da0fec3
2 changed files with 117 additions and 2 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
-  "version": "1.0.3",
+  "version": "1.0.4",
  "description": "SDK for matrix.org using React",
  "author": "matrix.org",
  "repository": {
@@ -79,7 +79,7 @@
    "linkifyjs": "^2.1.6",
    "lodash": "^4.13.1",
    "lolex": "2.3.2",
-    "matrix-js-sdk": "1.0.1",
+    "matrix-js-sdk": "1.0.2",
    "optimist": "^0.6.1",
    "pako": "^1.0.5",
    "prop-types": "^15.5.8",