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

..

sampledata

Add required resources.

2022-05-27 15:25:59 +03:00

src

Merge tag 'v1.5.22' into sc

2023-01-26 19:49:36 +01:00

.gitignore

…

build.gradle

Merge tag 'v1.5.22' into sc

2023-01-26 19:49:36 +01:00