SpiritCroc eab87760fe Merge tag 'v1.5.6' into sc ... Change-Id: I4c39b35ff50c57cc9894b709a91691fa745cb0a6 Conflicts: dependencies.gradle matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.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/mapper/RoomSummaryMapper.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt		2022-11-03 09:31:58 +01:00
..
src/main	Merge tag 'v1.5.6' into sc	2022-11-03 09:31:58 +01:00
build.gradle	Bump gradle from 7.2.2 to 7.3.1 (#7364)	2022-10-17 09:14:28 +02:00