ericdecanini c73c36eb26 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent ... # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo032.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt		2022-07-18 15:05:04 +02:00
..
.gitignore
5687.feature	font scale setting screen (#6453)	2022-07-18 09:49:57 +02:00
5733.misc	legacy groups removal (#6268)	2022-07-15 12:25:10 +02:00
5733.sdk	legacy groups removal (#6268)	2022-07-15 12:25:10 +02:00
6213.bugfix	Fixes wrong voice message being displayed and played on the timeline.	2022-07-14 17:21:16 +02:00
6314.misc	Adds changelog file	2022-06-15 15:03:28 +02:00
6478.misc	Changelog	2022-07-06 15:38:06 +02:00
6534.bugfix	fix olm session proliferation	2022-07-15 14:17:44 +02:00
6541.misc	Adding changelog entry	2022-07-18 09:43:33 +02:00
6549.bugfix	Changelog	2022-07-13 22:48:58 +02:00