Merge branch 'develop' into dialog-a11y

This commit is contained in:
Peter Vágner
2017-12-06 11:10:18 +01:00
18 changed files with 488 additions and 52 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "matrix-react-sdk",
"version": "0.11.2",
"version": "0.11.3",
"description": "SDK for matrix.org using React",
"author": "matrix.org",
"repository": {
@@ -72,7 +72,7 @@
"isomorphic-fetch": "^2.2.1",
"linkifyjs": "^2.1.3",
"lodash": "^4.13.1",
"matrix-js-sdk": "0.9.1",
"matrix-js-sdk": "0.9.2",
"optimist": "^0.6.1",
"prop-types": "^15.5.8",
"querystring": "^0.2.0",