Merge remote-tracking branch 'origin/develop' into develop

2017-12-04 12:26:11 +00:00 · 2017-12-04 12:26:11 +00:00 · bb6aabc017
parent 491bb4fd1d 1a0c0af447
commit bb6aabc017
1 changed files with 2 additions and 2 deletions
--- a/package.json
+++ b/package.json
@ -68,8 +68,8 @@
    "gfm.css": "^1.1.1",
    "highlight.js": "^9.0.0",
    "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.9.1",
-    "matrix-react-sdk": "0.11.2",
+    "matrix-js-sdk": "0.9.2",
+    "matrix-react-sdk": "0.11.3",
    "modernizr": "^3.1.0",
    "pako": "^1.0.5",
    "prop-types": "^15.5.10",