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
..
src	Merge branch 'develop' into feature/aris/thread_live_thread_list	2022-03-10 12:55:13 +02:00
.gitignore	first commit	2018-10-03 17:58:12 +02:00
build.gradle	updating to version 1.4.6 in prep for next release cycle	2022-03-09 16:03:00 +00:00
proguard-rules.pro	Remove dependency to org.greenrobot.eventbus library	2021-01-05 18:56:24 +01:00