SpiritCroc 3eeca39c4b Merge tag 'v1.5.8' into sc ... Release 1.5.8 Change-Id: I763148cfe6bb2155682637ce4c339951441b87ce 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/sync/SyncResponseHandler.kt vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt vector/src/main/res/layout/fragment_timeline.xml		2022-11-18 16:11:16 +01:00
..
sampledata
src	Merge tag 'v1.5.8' into sc	2022-11-18 16:11:16 +01:00
.gitignore
build.gradle	Merge tag 'v1.5.8' into sc	2022-11-18 16:11:16 +01:00