Merge branch 'master' into develop

(Keep js-sdk on develop)
This commit is contained in:
Richard van der Hoff 2017-02-04 10:42:31 +00:00
commit 6d8dcd97af
2 changed files with 16 additions and 1 deletions

View file

@ -1,3 +1,18 @@
Changes in [0.8.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.6) (2017-02-04)
===================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.6-rc.3...v0.8.6)
* Update to matrix-js-sdk 0.7.5 (no changes from 0.7.5-rc.3)
Changes in [0.8.6-rc.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.6-rc.3) (2017-02-03)
=============================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.6-rc.2...v0.8.6-rc.3)
* Update to matrix-js-sdk 0.7.5-rc.3
* Fix deviceverifybuttons
[5fd7410](https://github.com/matrix-org/matrix-react-sdk/commit/827b5a6811ac6b9d1f9a3002a94f9f6ac3f1d49c)
Changes in [0.8.6-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.6-rc.2) (2017-02-03)
=============================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.6-rc.1...v0.8.6-rc.2)

View file

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