diff --git a/CHANGELOG.md b/CHANGELOG.md index b0991182ac..3f94f797a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +Changes in [0.6.1](https://github.com/vector-im/vector-web/releases/tag/v0.6.1) (2016-04-22) +============================================================================================ +[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.6.0...v0.6.1) + + * Update to matrix-react-sdk 0.5.2 - see + [changelog](https://github.com/matrix-org/matrix-react-sdk/blob/v0.5.2/CHANGELOG.md) + * Don't relayout scrollpanels every time something changes + [\#1438](https://github.com/vector-im/vector-web/pull/1438) + * Include react-addons-perf for non-production builds + [\#1431](https://github.com/vector-im/vector-web/pull/1431) + Changes in [0.6.0](https://github.com/vector-im/vector-web/releases/tag/v0.6.0) (2016-04-19) ============================================================================================ [Full Changelog](https://github.com/vector-im/vector-web/compare/v0.5.0...v0.6.0) diff --git a/package.json b/package.json index 43b173255d..47997061ed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vector-web", - "version": "0.6.0", + "version": "0.6.1", "description": "Vector webapp", "author": "matrix.org", "repository": { @@ -41,8 +41,8 @@ "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", "linkifyjs": "^2.0.0-beta.4", - "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "matrix-org/matrix-react-sdk#develop", + "matrix-js-sdk": "^0.5.2", + "matrix-react-sdk": "^0.5.2", "modernizr": "^3.1.0", "q": "^1.4.1", "react": "^15.0.1",