mirror of
https://github.com/lux-tel/session-ios.git
synced 2026-10-30 20:38:32 +00:00
Morgan Pretty
eed02ca1e1
# Conflicts: # Session.xcodeproj/project.pbxproj # Session.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved # Session/Conversations/ConversationVC+Interaction.swift # Session/Conversations/Input View/InputView.swift # Session/Conversations/Settings/ThreadSettingsViewModel.swift # Session/Media Viewing & Editing/MediaPageViewController.swift # Session/Settings/DeveloperSettings/DeveloperSettingsViewModel.swift # Session/Settings/SettingsViewModel.swift # SessionMessagingKit/Database/Migrations/_045_LastProfileUpdateTimestamp.swift # SessionMessagingKit/Database/Models/Profile.swift # SessionMessagingKit/Jobs/DisplayPictureDownloadJob.swift # SessionMessagingKit/Jobs/UpdateProfilePictureJob.swift # SessionMessagingKit/LibSession/Config Handling/LibSession+Contacts.swift # SessionMessagingKit/LibSession/Config Handling/LibSession+GroupMembers.swift # SessionMessagingKit/LibSession/Config Handling/LibSession+UserProfile.swift # SessionMessagingKit/Messages/Visible Messages/VisibleMessage+Profile.swift # SessionMessagingKit/Protos/SessionProtos.proto # SessionMessagingKit/Sending & Receiving/AttachmentUploader.swift # SessionMessagingKit/Sending & Receiving/Attachments/SignalAttachment.swift # SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+Groups.swift # SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+Groups.swift # SessionMessagingKit/Utilities/DisplayPictureManager.swift # SessionMessagingKit/Utilities/Profile+Updating.swift # SessionMessagingKitTests/Jobs/DisplayPictureDownloadJobSpec.swift # SessionMessagingKitTests/Sending & Receiving/MessageReceiverGroupsSpec.swift # SessionMessagingKitTests/Sending & Receiving/MessageSenderGroupsSpec.swift # SessionMessagingKitTests/Sending & Receiving/Pollers/CommunityPollerSpec.swift # SessionNetworkingKit/FileServer/FileServerAPI.swift # SessionNetworkingKit/Models/FileUploadResponse.swift # SessionTests/Onboarding/OnboardingSpec.swift # SessionUIKit/Components/Input View/InputTextView.swift # SessionUIKit/Components/Modals & Toast/ConfirmationModal.swift # SessionUIKit/Components/ProfilePictureView.swift # SessionUtilitiesKit/General/Feature.swift # SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentTextToolbar.swift