SpiritCroc 3291517b8b Merge tag 'v1.6.20' into sc ... Change-Id: Ibf61668b312b1f4b1867ccc6ba4d3174e37550a5 Conflicts: library/attachment-viewer/build.gradle library/ui-styles/build.gradle matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector/src/main/java/im/vector/app/core/glide/ImageContentRendererDataLoader.kt vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt vector/src/main/java/im/vector/app/core/ui/views/JoinConferenceView.kt vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt vector/src/main/java/im/vector/app/features/crypto/verification/user/VerificationEpoxyExt.kt vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.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/composer/PlainTextComposerLayout.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.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/BasedMergedItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageAudioItem.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/MessageVoiceItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.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/RoomListFooterController.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/RoomListSectionBuilder.kt vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt vector/src/main/java/im/vector/app/features/home/room/threads/list/model/ThreadListItem.kt vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt vector/src/main/java/im/vector/app/features/login/LoginFragment.kt vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.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/roomprofile/members/RoomMemberListViewState.kt vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsController.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsFragment.kt vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt		2024-07-30 20:56:50 +02:00
..
src/main	Merge tag 'v1.6.20' into sc	2024-07-30 20:56:50 +02:00
build.gradle	Upgrade a few dependencies and update the codebase	2024-07-15 18:12:20 +02:00