ariskotsomitopoulos 21111922e6 Merge branch 'develop' into feature/aris/thread_live_thread_list ... # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt		2022-03-10 12:55:13 +02:00
..
.gitignore	Rename towncrier folder from newsfragment to changelog.d	2021-06-18 21:33:50 +02:00
5230.feature	Add changelogs	2022-02-23 12:06:35 +02:00
5232.feature	Add changelogs	2022-02-23 12:06:35 +02:00
5260.misc	include dms number in space unread number badge	2022-03-07 08:35:53 +01:00
5270.misc	Amend spaces menu to have consistent copy	2022-03-07 08:32:31 +01:00
5271.sdk	Add changelogs	2022-02-23 12:06:35 +02:00
5395.feature	Adding changelog entry	2022-03-09 09:44:06 +01:00