SpiritCroc f66747e972 Merge commit '0f4e546e1e96c76219649d27eca38a98e6c04c5f' into sc ... Change-Id: I782ef7ae26d7a3c168d26a1458f84fbfe80e9767 Conflicts: vector/src/debug/res/layout/activity_debug_menu.xml vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.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/list/RoomListFragment.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml vector/src/main/res/color/button_positive_background_selector.xml vector/src/main/res/color/button_positive_text_color_selector.xml vector/src/main/res/color/checked_accent_color_selector.xml vector/src/main/res/color/login_button_tint.xml vector/src/main/res/drawable/bg_breadcrumbs_typing.xml vector/src/main/res/drawable/bg_login_server_checked.xml vector/src/main/res/drawable/bg_send.xml vector/src/main/res/drawable/highlighted_message_background.xml vector/src/main/res/drawable/ic_settings_root_advanced.xml vector/src/main/res/drawable/ic_settings_root_call.xml vector/src/main/res/drawable/ic_settings_root_flair.xml vector/src/main/res/drawable/ic_settings_root_general.xml vector/src/main/res/drawable/ic_settings_root_help_about.xml vector/src/main/res/drawable/ic_settings_root_ignored_users.xml vector/src/main/res/drawable/ic_settings_root_labs.xml vector/src/main/res/drawable/ic_settings_root_notification.xml vector/src/main/res/drawable/ic_settings_root_preferences.xml vector/src/main/res/drawable/ic_settings_root_security_privacy.xml vector/src/main/res/drawable/reaction_rounded_rect_shape.xml vector/src/main/res/drawable/splash.xml vector/src/main/res/drawable/vector_tabbar_selected_background.xml vector/src/main/res/layout/alerter_incoming_call_layout.xml vector/src/main/res/layout/custom_action_item_layout_badge.xml vector/src/main/res/layout/dialog_export_e2e_keys.xml vector/src/main/res/layout/dialog_import_e2e_keys.xml vector/src/main/res/layout/fragment_home_drawer.xml vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml vector/src/main/res/layout/fragment_keys_backup_restore_success.xml vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml vector/src/main/res/layout/fragment_login_server_selection.xml vector/src/main/res/layout/fragment_login_server_url_form.xml vector/src/main/res/layout/fragment_login_server_url_form_2.xml vector/src/main/res/layout/fragment_login_splash.xml vector/src/main/res/layout/fragment_public_rooms.xml vector/src/main/res/layout/fragment_qr_code_scanner.xml vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml vector/src/main/res/layout/fragment_review_terms.xml vector/src/main/res/layout/fragment_room_detail.xml vector/src/main/res/layout/fragment_space_add_rooms.xml vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml vector/src/main/res/layout/item_bottom_sheet_action.xml vector/src/main/res/layout/item_bottom_sheet_message_preview.xml vector/src/main/res/layout/item_form_submit_button.xml vector/src/main/res/layout/item_generic_list.xml vector/src/main/res/layout/item_generic_with_value.xml vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml vector/src/main/res/layout/item_notification_troubleshoot.xml vector/src/main/res/layout/item_room.xml vector/src/main/res/layout/item_settings_centered_image.xml vector/src/main/res/layout/item_timeline_event_merged_room_creation_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_verification_action.xml vector/src/main/res/layout/view_attachment_type_selector.xml vector/src/main/res/layout/view_bottom_sheet_action_button.xml vector/src/main/res/layout/view_call_controls.xml vector/src/main/res/menu/menu_submit.xml vector/src/main/res/menu/menu_timeline.xml vector/src/main/res/values/styles_riot.xml vector/src/main/res/values/theme_dark.xml		2021-06-23 11:08:10 +02:00
..
src	Merge commit '0f4e546e1e96c76219649d27eca38a98e6c04c5f' into sc	2021-06-23 11:08:10 +02:00
.gitignore
build.gradle	Upgrade Olm dependency to 3.2.4	2021-06-02 10:05:14 +02:00
lint.xml	Set severity of ObsoleteSdkInt to error	2020-08-18 00:46:37 +02:00
proguard-rules.pro	Remove dependency to org.greenrobot.eventbus library	2021-01-05 18:56:24 +01:00