ac5caccdf9
# 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 |
||
|---|---|---|
| .. | ||
| build.yml | ||
| gradle-wrapper-validation.yml | ||
| integration.yml | ||
| quality.yml | ||
| sanity_test.yml | ||
| sync-from-external-sources.yml | ||
| tests.yml | ||
| triage-incoming.yml | ||
| triage-move-labelled.yml | ||
| triage-move-unlabelled.yml | ||
| triage-priority-bugs.yml | ||
| update-gradle-wrapper.yml | ||