From 9e88a7d1c02accef18346a59e7992c3994d487d5 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 22 May 2020 14:17:58 +0100 Subject: [PATCH 1/3] Upgrade matrix-react-sdk to 2.6.1 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 931a1065be..5126dab39e 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "6.1.0", - "matrix-react-sdk": "2.6.0", + "matrix-react-sdk": "2.6.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 6f0c945a61..c3e8ee762b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6964,10 +6964,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.6.0.tgz#8266aa32271565e0a2b475f6e65d7cb49bcb59b2" - integrity sha512-j4OOFRKrSoQqiePGwmy5sF6QhPADIqJX8ZOazim3szlXbsvP/SHxe1MHVqCFbikDpikIPBUKL2aradMavAziBw== +matrix-react-sdk@2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.6.1.tgz#6e7f19282f336678043091b4d3b0a440ad218cfb" + integrity sha512-elLK3d8p99A/OPfHVa/MkuegXNnN4UgpLJw6343D8d7jsJ6GtoxS7vVCJSUdpyJ3fg/kVviZA5MejyzMTUsNSw== dependencies: "@babel/runtime" "^7.8.3" blueimp-canvas-to-blob "^3.5.0" From 55cba2caa318d9539d54232ab13806603e3645be Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 22 May 2020 14:21:23 +0100 Subject: [PATCH 2/3] Prepare changelog for v1.6.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90d1b826dc..46e78dce6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.6.2](https://github.com/vector-im/riot-web/releases/tag/v1.6.2) (2020-05-22) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.1...v1.6.2) + + * Upgrade to React SDK 2.6.1 + Changes in [1.6.1](https://github.com/vector-im/riot-web/releases/tag/v1.6.1) (2020-05-19) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.1-rc.1...v1.6.1) From 075299a7eb0ab8acbf4a370b5fc3bed6f6323ff2 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 22 May 2020 14:21:24 +0100 Subject: [PATCH 3/3] v1.6.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5126dab39e..55da947fd5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.6.1", + "version": "1.6.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {