ariskotsomitopoulos ac5caccdf9 Merge branch 'develop' into feature/aris/threads ... # Conflicts: # matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt # tools/check/forbidden_strings_in_code.txt # vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt # vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt # vector/src/main/res/menu/menu_timeline.xml		2022-01-07 13:29:43 +02:00
..
assets	Merge branch 'develop' into feature/bma/posthog	2021-12-13 23:18:14 +01:00
java/im/vector/app	Merge branch 'develop' into feature/aris/threads	2022-01-07 13:29:43 +02:00
res	Merge branch 'develop' into feature/aris/threads	2022-01-07 13:29:43 +02:00
AndroidManifest.xml	Merge branch 'develop' into feature/aris/threads	2022-01-07 13:29:43 +02:00