Merge branch 'master' into develop

This commit is contained in:
Luke Barnard 2017-12-04 12:24:56 +00:00
commit 4f58b92a14
2 changed files with 7 additions and 1 deletions

View file

@ -1,3 +1,9 @@
Changes in [0.11.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.11.3) (2017-12-04)
=====================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.11.2...v0.11.3)
* Bump js-sdk version to pull in fix for [setting room publicity in a group](https://github.com/matrix-org/matrix-js-sdk/commit/aa3201ebb0fff5af2fb733080aa65ed1f7213de6).
Changes in [0.11.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.11.2) (2017-11-28)
=====================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.11.1...v0.11.2)

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": {