SpiritCroc ecd28447c9 Merge tag 'v1.4.0' into sc ... Change-Id: If953d524434cd8a7073a16014f4ec6850b72a226 Conflicts: library/ui-styles/src/main/res/values/styles_timeline.xml matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/media/PreviewUrlData.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.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/item/MessageVoiceItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt vector/src/main/res/drawable/ic_filter.xml vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml vector/src/main/res/layout/fragment_timeline.xml vector/src/main/res/layout/item_bottom_sheet_message_preview.xml vector/src/main/res/layout/item_timeline_event_base.xml vector/src/main/res/layout/item_timeline_event_file_stub.xml vector/src/main/res/layout/item_timeline_event_notice_stub.xml vector/src/main/res/layout/item_timeline_event_voice_stub.xml vector/src/main/res/layout/view_voice_message_recorder.xml vector/src/main/res/menu/menu_timeline.xml		2022-02-19 10:55:47 +01:00
..
core-utils	[merge] Further merge fixups	2022-01-29 15:56:13 +01:00
jsonviewer	Bump json from 20190722 to 20211205	2022-01-18 23:08:02 +00:00
ui-styles	Merge tag 'v1.4.0' into sc	2022-02-19 10:55:47 +01:00