SpiritCroc 53c498b728 Merge tag 'v1.0.14' into sc ... Change-Id: I0d3df2f8c5f4e611f3268c4c4d2784f7eac89bb5 Conflicts: gradle/wrapper/gradle-wrapper.properties 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/media/UrlsExtractor.kt vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt vector/src/main/java/im/vector/app/features/home/HomeActivity.kt vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt vector/src/main/res/layout/composer_layout_constraint_set_compact.xml vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml vector/src/main/res/xml/vector_settings_preferences.xml		2021-01-16 11:21:09 +01:00
..
fastlane/metadata/android	[TMP] Automatic upstream merge preparation	2021-01-15 17:33:22 +01:00
metadata/android	[TMP] Automatic upstream merge preparation	2021-01-15 17:33:22 +01:00