From 874e88c4a83f15fcbf40293ea6d1cdad97e55c99 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Sep 2017 18:05:22 +0100 Subject: [PATCH 1/4] react-sdk v0.10.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 083bd9462a..eea2a3fe6f 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "highlight.js": "^9.0.0", "linkifyjs": "^2.1.3", "matrix-js-sdk": "0.8.3", - "matrix-react-sdk": "0.10.4", + "matrix-react-sdk": "0.10.5", "modernizr": "^3.1.0", "pako": "^1.0.5", "prop-types": "^15.5.10", From f450ce422e6cea5748ad231c4c00231938d8707d Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Sep 2017 18:06:03 +0100 Subject: [PATCH 2/4] v0.12.5 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 5f897136a3..3ab6a6e998 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.12.4", + "version": "0.12.5", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From e8c347a7559e3f6342d59f6a238087f07ec5e5fa Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Sep 2017 18:08:17 +0100 Subject: [PATCH 3/4] Prepare changelog for v0.12.5 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ab5a7ec6f..eb358856a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.12.5](https://github.com/vector-im/riot-web/releases/tag/v0.12.5) (2017-09-21) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.4...v0.12.5) + + * Use react-sdk v0.10.5 to fix build + Changes in [0.12.4](https://github.com/vector-im/riot-web/releases/tag/v0.12.4) (2017-09-20) ============================================================================================ [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.4-rc.1...v0.12.4) From fbccf22e0086b5421f21cc8cb7819405a5dc9cab Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Sep 2017 18:08:17 +0100 Subject: [PATCH 4/4] v0.12.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eea2a3fe6f..44839aad56 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "0.12.4", + "version": "0.12.5", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "repository": {