Merge branch 'master' into develop

This commit is contained in:
David Baker 2019-05-15 14:31:30 +01:00
commit 39b8d8957d
2 changed files with 10 additions and 1 deletions

View File

@ -1,3 +1,12 @@
Changes in [1.1.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.1.2) (2019-05-15)
===================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.1.1...v1.1.2)
* Always thumbnail for GIFs
[\#2976](https://github.com/matrix-org/matrix-react-sdk/pull/2976)
* Fix Single Sign-on
[\#2975](https://github.com/matrix-org/matrix-react-sdk/pull/2975)
Changes in [1.1.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.1.1) (2019-05-14)
===================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.1.0...v1.1.1)

View File

@ -1,6 +1,6 @@
{
"name": "matrix-react-sdk",
"version": "1.1.1",
"version": "1.1.2",
"description": "SDK for matrix.org using React",
"author": "matrix.org",
"repository": {