mirror of
https://github.com/lux-tel/session-ios.git
synced 2026-10-30 20:38:32 +00:00
Morgan Pretty
1817fbb45d
# Conflicts: # Session.xcodeproj/project.pbxproj # Session/Closed Groups/EditGroupViewModel.swift # Session/Conversations/ConversationVC+Interaction.swift # Session/Conversations/ConversationVC.swift # Session/Conversations/ConversationViewModel.swift # Session/Conversations/Input View/ExpandingAttachmentsButton.swift # Session/Conversations/Input View/InputView.swift # Session/Conversations/Message Cells/Content Views/SwiftUI/QuoteView_SwiftUI.swift # Session/Conversations/Message Cells/VisibleMessageCell.swift # Session/Conversations/Settings/ThreadSettingsViewModel.swift # Session/Media Viewing & Editing/MessageInfoScreen.swift # Session/Meta/AppDelegate.swift # Session/Settings/BlockedContactsViewModel.swift # Session/Settings/DeveloperSettings/DeveloperSettingsProViewModel.swift # Session/Settings/SettingsViewModel.swift # Session/Settings/Views/ThemeMessagePreviewView.swift # Session/Shared/BaseVC.swift # Session/Shared/UserListViewModel.swift # SessionMessagingKit/Database/Models/LinkPreview.swift # SessionMessagingKit/LibSession/Config Handling/LibSession+Pro.swift # SessionMessagingKit/Open Groups/OpenGroupManager.swift # SessionMessagingKit/Sending & Receiving/Link Previews/LinkPreviewDraft.swift # SessionMessagingKit/Shared Models/MessageViewModel.swift # SessionMessagingKit/Shared Models/SessionThreadViewModel.swift # SessionMessagingKit/Utilities/ProfilePictureView+Convenience.swift # SessionMessagingKit/Utilities/SessionProState.swift # SessionShareExtension/ThreadPickerVC.swift # SessionUIKit/Components/ProfilePictureView.swift # SessionUIKit/Components/QuoteView.swift # SessionUIKit/Components/SwiftUI/ProCTAModal.swift # SessionUIKit/Utilities/MentionUtilities.swift # SessionUtilitiesKit/General/Feature.swift # SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentApprovalViewController.swift # SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentTextToolbar.swift