Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3

2020-05-23 11:01:36 +01:00
parent d29ba5b597 696f158be0
commit efeb8a8487
6 changed files with 40 additions and 40 deletions
@@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
-  "version": "2.6.0",
+  "version": "2.6.1",
  "description": "SDK for matrix.org using React",
  "author": "matrix.org",
  "repository": {