Merge branch 'develop' into matthew/slate

2018-05-15 01:00:07 +01:00
parent 12a56e8b8e 6bfd7fca9c
commit b60ccad29b
24 changed files with 340 additions and 50 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
-  "version": "0.12.3",
+  "version": "0.12.4-rc.3",
  "description": "SDK for matrix.org using React",
  "author": "matrix.org",
  "repository": {