Files
Morgan Pretty 30210dc27b Merge branch 'session-pro-settings' into feature/libsession-message-wrapping
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Message Cells/VisibleMessageCell.swift
#	Session/Home/HomeViewModel.swift
#	Session/Home/Message Requests/MessageRequestsViewModel.swift
#	Session/Media Viewing & Editing/MessageInfoScreen.swift
#	Session/Settings/DeveloperSettings/DeveloperSettingsProViewModel.swift
#	Session/Settings/DeveloperSettings/DeveloperSettingsViewModel.swift
#	Session/Settings/SessionProSettings/SessionProSettingsViewModel.swift
#	Session/Settings/SettingsViewModel.swift
#	Session/Settings/Views/ThemeMessagePreviewView.swift
#	SessionMessagingKit/Shared Models/MessageViewModel.swift
#	SessionMessagingKit/Utilities/AttachmentManager.swift
#	SessionMessagingKit/Utilities/SessionProState.swift
#	SessionUIKit/Components/Input View/InputView.swift
#	SessionUIKit/Components/SwiftUI/ProCTAModal.swift
#	SessionUIKit/Components/SwiftUI/QuoteView_SwiftUI.swift
#	SessionUIKit/Screens/Settings/SessionProSettings/SessionProPaymentScreen+Models.swift
#	SessionUIKit/Screens/Settings/SessionProSettings/SessionProPaymentScreen+RequestRefund.swift
#	SessionUIKit/Style Guide/Constants+Apple.swift
#	SessionUIKit/Style Guide/Themes/ThemedAttributedString.swift
#	SessionUIKit/Types/Localization.swift
#	SessionUIKit/Utilities/MentionUtilities.swift
#	SessionUtilitiesKit/Dependency Injection/Dependencies.swift
#	SessionUtilitiesKit/General/Feature.swift
2025-12-01 11:04:31 +11:00
..