chore: Fix changelogs after rebase

Author: pixlwave

bindings/matrix-sdk-ffi/CHANGELOG.md

@@ -23,6 +23,11 @@ All notable changes to this project will be documented in this file.
   In the future additional choices (such as session storage, `sqlite` and `indexeddb`) 
   will likely be added as well.
 
+Breaking changes:
+
+- `Client::reset_server_capabilities` has been renamed to `Client::reset_server_info`.
+  ([#5167](https://github.com/matrix-org/matrix-rust-sdk/pull/5167))
+
 ## [0.12.0] - 2025-06-10
 
 Breaking changes:
@@ -39,7 +44,6 @@ Breaking changes:
 - `RoomInfo` replaces its field `is_tombstoned: bool` with `tombstone: Option<RoomTombstoneInfo>`,
   containing the data needed to implement the room migration UI, a message and the replacement room id.
   ([#5027](https://github.com/matrix-org/matrix-rust-sdk/pull/5027))
-- `Client::reset_server_capabilities` has been renamed to `Client::reset_server_info`.
 
 Additions:
 

crates/matrix-sdk-base/CHANGELOG.md

@@ -6,6 +6,13 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased] - ReleaseDate
 
+### Refactor
+
+- The cached `ServerCapabilities` has been renamed to `ServerInfo` and
+  additionally contains the well-known response alongside the existing server versions.
+  Despite the old name, it does not contain the server capabilities.
+  ([#5167](https://github.com/matrix-org/matrix-rust-sdk/pull/5167))
+
 ## [0.12.0] - 2025-06-10
 
 No notable changes in this release.
@@ -52,9 +59,6 @@ No notable changes in this release.
   ([#4897](https://github.com/matrix-org/matrix-rust-sdk/pull/4897))
 - [**breaking**] `RoomInfo::prev_state` has been removed due to being useless.
   ([#5054](https://github.com/matrix-org/matrix-rust-sdk/pull/5054))
-- The cached `ServerCapabilities` has been renamed to `ServerInfo` and additionally contains
-  the well-known response alongside the existing server versions. Despite the old name, it
-  does not contain the server capabilities (yet?!).
 
 ## [0.10.0] - 2025-02-04
 

crates/matrix-sdk/CHANGELOG.md

@@ -6,6 +6,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased] - ReleaseDate
 
+- `ClientServerCapabilities` has been renamed to `ClientServerInfo`. Alongside this,
+  `Client::reset_server_info` is now `Client::reset_server_info` and `Client::fetch_server_capabilities`
+  is now `Client::fetch_server_versions`, returning the server versions response directly.
+  ([#5167](https://github.com/matrix-org/matrix-rust-sdk/pull/5167))
 - `Client::add_event_handler`: Set `Option<EncryptionInfo>` in `EventHandlerData` for to-device messages.
   If the to-device message was encrypted, the `EncryptionInfo` will be set. If it is `None` the message was sent in clear.
   ([#5099](https://github.com/matrix-org/matrix-rust-sdk/pull/5099))
@@ -78,9 +82,6 @@ All notable changes to this project will be documented in this file.
   ([#5047](https://github.com/matrix-org/matrix-rust-sdk/pull/5047))
 - `Room::set_unread_flag()` is now a no-op if the unread flag already has the wanted value.
   ([#5055](https://github.com/matrix-org/matrix-rust-sdk/pull/5055))
-- `ClientServerCapabilities` has been renamed to `ClientServerInfo`. Alongside this,
-  `Client::reset_server_info` is now `Client::reset_server_info` and `Client::fetch_server_capabilities`
-  is now `Client::fetch_server_versions`, returning the server versions response directly.
 
 ## [0.11.0] - 2025-04-11