Merge branch 'master' into develop

This commit is contained in:
Matthew Hodgson 2016-09-02 17:23:02 +01:00
commit 0494dff545
2 changed files with 8 additions and 1 deletions

View file

@ -1,3 +1,10 @@
Changes in [0.7.5-r3](https://github.com/vector-im/vector-web/releases/tag/v0.7.5-r3) (2016-09-02)
==================================================================================================
[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.5-r2...v0.7.5-r3)
* Bump to matrix-react-sdk 0.6.5-r3 in order to fix bug #2020 (tightloop when flooded with join events)
Changes in [0.7.5-r2](https://github.com/vector-im/vector-web/releases/tag/v0.7.5-r2) (2016-09-01)
==================================================================================================
[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.5-r1...v0.7.5-r2)

View file

@ -1,6 +1,6 @@
{
"name": "vector-web",
"version": "0.7.5-r2",
"version": "0.7.5-r3",
"description": "Vector webapp",
"author": "matrix.org",
"repository": {