Merge branch 'master' into develop

This commit is contained in:
Matthew Hodgson 2017-06-02 22:52:28 +01:00
commit 85782f736c
2 changed files with 7 additions and 1 deletions

View file

@ -1,3 +1,9 @@
Changes in [0.10.1](https://github.com/vector-im/riot-web/releases/tag/v0.10.1) (2017-06-02)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.10.0...v0.10.1)
* Update to matrix-react-sdk 0.9.1 to fix i18n error which broke start chat in some circumstances
Changes in [0.10.0](https://github.com/vector-im/riot-web/releases/tag/v0.10.0) (2017-06-02)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.10.0-rc.2...v0.10.0)

View file

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
"version": "0.10.0",
"version": "0.10.1",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"repository": {