mirror of https://github.com/oxen-io/session-ios
You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
# Conflicts: # Session.xcodeproj/project.pbxproj # Session/Conversations/ConversationVC+Interaction.swift # Session/Conversations/ConversationViewModel.swift # Session/Media Viewing & Editing/GIFs/GifPickerCell.swift # Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift # Session/Media Viewing & Editing/PhotoCapture.swift # Session/Media Viewing & Editing/PhotoLibrary.swift # Session/Meta/Settings.bundle/Root.plist # Session/Meta/Translations/InfoPlist.xcstrings # SessionMessagingKit/Database/Models/Attachment.swift # SessionMessagingKit/Database/Models/LinkPreview.swift # SessionMessagingKit/Sending & Receiving/Attachments/SignalAttachment.swift # SessionMessagingKitTests/LibSession/LibSessionUtilSpec.swift # SessionShareExtension/ShareNavController.swift # SessionShareExtension/ThreadPickerVC.swift # SessionSnodeKit/LibSession/LibSession+Networking.swift # SessionUtilitiesKit/Configuration.swift # SessionUtilitiesKit/Media/Data+Image.swift # SessionUtilitiesKit/Media/DataSource.swift # SignalUtilitiesKit/Configuration.swift # SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentApprovalViewController.swift # SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorModel.swift # _SharedTestUtilities/NimbleExtensions.swift |
7 months ago | |
---|---|---|
.. | ||
xcshareddata | 7 months ago | |
contents.xcworkspacedata | 8 months ago |