SpiritCroc d8bd92c413 Merge tag 'v1.5.22' into sc ... Change-Id: I3e8db4d0d0d6afa0f47c9daa0f809410938674e0 Conflicts: 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/session/room/timeline/LoadTimelineStrategy.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanReplyEventUseCase.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt		2023-01-26 19:49:36 +01:00
..
debug	Merge tag 'v1.5.4' into merge-v1.5.4	2022-10-28 18:02:53 +02:00
main	Merge tag 'v1.5.22' into sc	2023-01-26 19:49:36 +01:00
release/res/values	Move test style Activity and layout to the new ui-style module	2021-06-15 18:17:36 +02:00