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
..
ISSUE_TEMPLATE	Merge pull request #4257 from opusforlife2/FR_template	2021-11-16 13:34:44 +01:00
workflows	Merge branch 'develop' into feature/aris/threads	2022-01-07 13:29:43 +02:00
dependabot.yml	letting dependabot ignore the zxing dependency, it appears the author does not intend to support older versions of android in the new versions of the library	2021-10-28 16:21:17 +01:00
PULL_REQUEST_TEMPLATE.md	Update location of sign off documentation	2021-10-15 10:27:22 +02:00