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
..
sampledata	Implement poll in timeline ui.	2021-12-03 11:39:41 +03:00
signature
src	Merge branch 'develop' into feature/aris/thread_live_thread_list	2022-03-10 12:55:13 +02:00
.gitignore
build.gradle	updating to version 1.4.6 in prep for next release cycle	2022-03-09 16:03:00 +00:00
lint.xml	Lint: "MissingQuantity" -> warning	2022-03-03 10:22:59 +01:00
proguard-rules.pro	Fix Authenticated Jitsi not working in release #3841	2021-08-16 15:43:35 +02:00