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
..
build.yml	Remove unused commented lines	2021-09-14 10:45:29 +03:00
gradle-wrapper-validation.yml	Official Gradle Wrapper Validation Action	2020-08-18 00:49:17 +02:00
integration.yml	Github actions test	2022-01-04 00:49:39 +02:00
quality.yml	klint -> ktlint	2021-10-07 10:36:38 +02:00
sanity_test.yml	using Pixel 5 profile and ensuring jobs stay marked as failed after collecting screenshots and logs	2021-11-18 17:49:35 +00:00
sync-from-external-sources.yml	Add automation to import the plan	2021-12-02 14:10:03 +01:00
tests.yml	Preventing Dependabot to publish unit test results	2021-09-24 11:14:57 +03:00
triage-incoming.yml	Fix malformed comments and code review	2022-01-05 09:19:59 +00:00
triage-move-labelled.yml	Fix malformed comments and code review	2022-01-05 09:19:59 +00:00
triage-move-unlabelled.yml	Fix malformed comments and code review	2022-01-05 09:19:59 +00:00
triage-priority-bugs.yml	Fix malformed comments and code review	2022-01-05 09:19:59 +00:00
update-gradle-wrapper.yml	Add workflow for Update Gradle Wrapper Action.	2020-09-24 11:19:28 +02:00