index : matrix-js-sdk

My fork of matrix-js-sdk

diff options
context:
space:
mode:
authorRiotRobot <[email protected]>2020-06-05 15:10:44 +0100
committerRiotRobot <[email protected]>2020-06-05 15:10:44 +0100
commitebe66bdd6e0f6edbc60be1612c5a1fc0c9ea092c (patch)
tree173dfd16ee3b5728afb8983b3f5eaa29091617c0
parent013fbb87a789027f01a7585082d8eb692b072a9f (diff)
parent12b573bc63dada2ad3590dda113f99bc2530b2f1 (diff)
downloadmatrix-js-sdk-ebe66bdd6e0f6edbc60be1612c5a1fc0c9ea092c.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 af2765c9..30069210 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+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)
+
+ * Bring back backup key format migration
+ [\#1399](https://github.com/matrix-org/matrix-js-sdk/pull/1399)
+
Changes in [6.2.0](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v6.2.0) (2020-06-04)
================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v6.2.0-rc.1...v6.2.0)
diff --git a/package.json b/package.json
index f19df47a..3afbbb08 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "matrix-js-sdk",
- "version": "6.2.0",
+ "version": "6.2.1",
"description": "Matrix Client-Server SDK for Javascript",
"scripts": {
"prepare": "yarn build",