Merge branch 'master' into develop

2023-03-31 10:11:09 +01:00
parent f152613f83 af3e57f9e1
commit 0904f6a1bb
2 changed files with 7 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [3.69.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.69.1) (2023-03-31)
+=====================================================================================================
+
+## 🐛 Bug Fixes
+ * Fix detection of encryption for all users in a room ([\#10487](https://github.com/matrix-org/matrix-react-sdk/pull/10487)). Fixes vector-im/element-web#24995.
+
 Changes in [3.69.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.69.0) (2023-03-28)
 =====================================================================================================

--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "matrix-react-sdk",
-    "version": "3.69.0",
+    "version": "3.69.1",
    "description": "SDK for matrix.org using React",
    "author": "matrix.org",
    "repository": {