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

..

androidTest/java/im/vector/app

Merge branch 'develop' into feature/aris/thread_live_thread_list

2022-02-24 12:45:08 +02:00

debug

Lifting debug overrides to their own abstraction (#5361)

2022-03-02 10:08:43 +00:00

fdroid

Fix "@JvmStatic used for @Provides function in an object class" Lint warning.

2021-11-19 15:29:11 +01:00

gplay

Rename getTimeLine to getTimeline to align naming. Also create TimelineEventDataSource.

2022-02-23 18:00:31 +01:00

main

Merge branch 'develop' into feature/aris/thread_live_thread_list

2022-03-10 12:55:13 +02:00

release

Lifting debug overrides to their own abstraction (#5361)

2022-03-02 10:08:43 +00:00

sharedTest/java/im/vector/app/test/shared

…

test/java/im/vector/app

FTUE - Choose a display picture (#5323)

2022-03-07 14:07:22 +00:00