SpiritCroc acdd4e24b9 Merge tag 'v1.3.12' into sc ... Change-Id: I66c0120371c3f52295f033ec21702c08381b5b10 Conflicts: build.gradle vector/build.gradle vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.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/home/room/list/actions/RoomListQuickActionsEpoxyController.kt vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt vector/src/main/java/im/vector/app/features/navigation/Navigator.kt vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt vector/src/main/res/drawable/highlighted_message_background.xml 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_home_detail.xml vector/src/main/res/layout/fragment_login_server_selection.xml vector/src/main/res/layout/fragment_room_detail.xml vector/src/main/res/layout/item_bottom_sheet_message_preview.xml vector/src/main/res/layout/item_expandable_textview.xml vector/src/main/res/layout/item_login_header.xml vector/src/main/res/layout/item_radio.xml vector/src/main/res/layout/item_room.xml vector/src/main/res/layout/item_timeline_event_base.xml vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml vector/src/main/res/layout/item_timeline_event_code_block_stub.xml vector/src/main/res/layout/item_timeline_event_media_message_stub.xml vector/src/main/res/layout/item_timeline_event_poll_stub.xml vector/src/main/res/layout/item_timeline_event_redacted_stub.xml vector/src/main/res/layout/item_timeline_event_voice_stub.xml vector/src/main/res/layout/view_stub_room_profile_header.xml vector/src/main/res/layout/view_url_preview.xml vector/src/main/res/xml/vector_settings_labs.xml vector/src/main/res/xml/vector_settings_root.xml		2021-12-23 14:36:13 +01:00
..
ui-styles	Merge tag 'v1.3.12' into sc	2021-12-23 14:36:13 +01:00