Merge branch 'develop' into matthew/slate

2018-05-19 12:58:43 +01:00
parent 089ac337f4 6d2d7bb287
commit 4972a234c4
15 changed files with 265 additions and 23 deletions
@@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
-  "version": "0.12.4-rc.3",
+  "version": "0.12.5",
  "description": "SDK for matrix.org using React",
  "author": "matrix.org",
  "repository": {