index : matrix-js-sdk

My fork of matrix-js-sdk

diff options
context:
space:
mode:
authorRiotRobot <[email protected]>2020-06-16 11:04:39 +0100
committerRiotRobot <[email protected]>2020-06-16 11:04:39 +0100
commit1c194e81637fb07fe6ad67cda33be0d5d4c10115 (patch)
tree15a7637a4aa44538ef16f0a1b78f6734f257c0a3
parentaa2d0d9a081dd8d274d8f8a8ba1f796d17faa338 (diff)
parentdb7848c9ba7c8edf6a30fab96a47b762a1639486 (diff)
downloadmatrix-js-sdk-1c194e81637fb07fe6ad67cda33be0d5d4c10115.tar.gz
Merge branch 'master' into develop
-rw-r--r--CHANGELOG.md7
-rw-r--r--package.json2
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30069210..add68d23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [6.2.2](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v6.2.2) (2020-06-16)
+================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v6.2.1...v6.2.2)
+
+ * Use existing session id for fetching flows as to not get a new session
+ [\#1407](https://github.com/matrix-org/matrix-js-sdk/pull/1407)
+
Changes in [6.2.1](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v6.2.1) (2020-06-05)
================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v6.2.0...v6.2.1)
diff --git a/package.json b/package.json
index 3afbbb08..eacc926a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "matrix-js-sdk",
- "version": "6.2.1",
+ "version": "6.2.2",
"description": "Matrix Client-Server SDK for Javascript",
"scripts": {
"prepare": "yarn build",