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.
session-ios/Session/Meta/Settings.bundle
Morgan Pretty 840e01d847 Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
# 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
..
Dependencies-settings-metadata.plist Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild 10 months ago
Root.plist add script the catch licenses in SPM and generate a plist file as Acknowledgement in Settings.bundle 7 months ago
ThirdPartyLicenses.plist Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 7 months ago