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
..
sdk	Merge branch 'develop' into feature/aris/thread_live_thread_list	2022-03-10 12:55:13 +02:00