ericdecanini 9e1235d51f 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/MigrateSessionTo034.kt		2022-07-20 16:44:33 +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
6200.bugfix	Adds isUpgraded method to VersioningState	2022-06-03 12:02:50 +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
6437.feature	Adding changelog entry	2022-07-19 14:05:13 +02:00
6478.misc	Changelog	2022-07-06 15:38:06 +02:00
6487.feature	Adding changelog entry	2022-07-19 14:04:08 +02:00
6534.bugfix	fix olm session proliferation	2022-07-15 14:17:44 +02:00
6537.bugfix	Adding a changelog entry	2022-07-19 14:43:33 +02:00
6538.misc	Changelog	2022-07-18 17:22:49 +02:00
6541.misc	Adding changelog entry	2022-07-18 09:43:33 +02:00
6546.feature	adding changelog entry	2022-07-15 18:09:04 +01:00
6547.feature	adding changelog entry	2022-07-15 16:02:46 +01:00
6549.bugfix	Changelog	2022-07-13 22:48:58 +02:00
6567.feature	Changelog added.	2022-07-15 15:45:00 +03:00
6579.bugfix	Changelog added.	2022-07-18 13:53:18 +03:00
6584.misc	Adds changelog file	2022-07-18 16:57:54 +02:00
6585.bugfix	add change log	2022-07-20 09:57:31 +02:00
6587.bugfix	Changelog added.	2022-07-18 18:52:37 +03:00
6596.bugfix	Adding changelog entry	2022-07-20 09:57:54 +02:00