Merge branch 'master' into develop

Topheee · May 16, 2023 · 441001e · 441001e
2 parents 3b76982 + 417ebda
commit 441001e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,16 @@
+## Changes in 0.26.10 (2023-05-16)
+
+🙌 Improvements
+
+- Crypto: Enable Crypto SDK by default ([#1770](https://github.com/matrix-org/matrix-ios-sdk/pull/1770))
+- Crypto: Deprecate MXLegacyCrypto ([#1772](https://github.com/matrix-org/matrix-ios-sdk/pull/1772))
+
+🐛 Bugfixes
+
+- Poll: Refreshing the poll when receiving pollEnd can break the chronological order in the store. ([#1776](https://github.com/matrix-org/matrix-ios-sdk/pull/1776))
+- Fix breadcrumb list not updating when leaving a room. Contributed by @JanNikGra. ([#1777](https://github.com/vector-im/element-ios/issues/1777))
+
+
 ## Changes in 0.26.9 (2023-04-18)
 
 🐛 Bugfixes

diff --git a/MatrixSDK.podspec b/MatrixSDK.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MatrixSDK"
-  s.version      = "0.26.9"
+  s.version      = "0.26.10"
   s.summary      = "The iOS SDK to build apps compatible with Matrix (https://www.matrix.org)"
 
   s.description  = <<-DESC

diff --git a/MatrixSDK/MatrixSDKVersion.m b/MatrixSDK/MatrixSDKVersion.m
@@ -16,4 +16,4 @@
 
 #import <Foundation/Foundation.h>
 
-NSString *const MatrixSDKVersion = @"0.26.9";
+NSString *const MatrixSDKVersion = @"0.26.10";
diff --git a/changelog.d/1777.bugfix b/changelog.d/1777.bugfix
diff --git a/changelog.d/pr-1770.change b/changelog.d/pr-1770.change
diff --git a/changelog.d/pr-1772.change b/changelog.d/pr-1772.change
diff --git a/changelog.d/pr-1776.bugfix b/changelog.d/pr-1776.bugfix