SpiritCroc d9c1ec588d Merge tag 'v1.6.0' into sc ... v1.6.0 Change-Id: Iaca4b437bc5a267c40b83a87a98eb7761dae345b Conflicts: library/ui-styles/src/main/res/values/styles_app_bar_layout.xml matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector-app/build.gradle vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt vector/src/main/res/layout/dialog_disclaimer_content.xml vector/src/main/res/xml/vector_settings_help_about.xml		2023-05-22 14:19:46 +02:00
..
java/im/vector/app	Merge tag 'v1.6.0' into sc	2023-05-22 14:19:46 +02:00
res	Merge tag 'v1.6.0' into sc	2023-05-22 14:19:46 +02:00
AndroidManifest.xml	fix rebase	2023-01-03 10:00:02 +01:00