SpiritCroc d5d555d07f Merge tag 'v1.4.8' into merge-v1.4.8 ... Change-Id: Ic6338fef4f27ca95016eb11ab07a10d3f3a8986e Conflicts: library/ui-styles/src/main/res/values/dimens.xml library/ui-styles/src/main/res/values/styles_buttons.xml matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt 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/room/summary/RoomSummaryUpdater.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.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/timeline/action/MessageActionsViewModel.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/style/TimelineMessageLayout.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.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/RoomListSectionBuilderSpace.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomsSection.kt vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt vector/src/main/res/drawable/ic_home_bottom_catchup.xml vector/src/main/res/drawable/ic_shield_custom.xml vector/src/main/res/drawable/ic_shield_trusted.xml vector/src/main/res/drawable/ic_shield_trusted_no_border.xml vector/src/main/res/layout/fragment_ftue_account_created.xml vector/src/main/res/layout/fragment_timeline.xml vector/src/main/res/layout/item_timeline_event_code_block_stub.xml vector/src/main/res/layout/view_attachment_type_selector.xml vector/src/main/res/layout/view_room_detail_toolbar.xml vector/src/main/res/menu/menu_submit.xml		2022-03-30 15:53:51 +02:00
..
src/main	Merge tag 'v1.4.8' into merge-v1.4.8	2022-03-30 15:53:51 +02:00
.gitignore	Create module vector-config	2022-02-23 18:08:04 +01:00
build.gradle	Create module vector-config	2022-02-23 18:08:04 +01:00