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/SessionShareExtension
Morgan Pretty 2032dafc74 Merge remote-tracking branch 'upstream/dev' into feature/swift-package-manager
# Conflicts:
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionSnodeKit/Networking/SnodeAPI.swift
#	SessionUtilitiesKit/Media/DataSource.h
#	SessionUtilitiesKit/Media/DataSource.m
8 months ago
..
Base.lproj Fixed a number of bugs with the config handling 2 years ago
Meta Replaced Cocoapods with Swift Package Manager for dependency management 8 months ago
SAEScreenLockViewController.swift Merge remote-tracking branch 'upstream/dev' into feature/swift-package-manager 8 months ago
ShareAppExtensionContext.swift Replaced Cocoapods with Swift Package Manager for dependency management 8 months ago
ShareNavController.swift Merge remote-tracking branch 'upstream/dev' into feature/swift-package-manager 8 months ago
SimplifiedConversationCell.swift Merge remote-tracking branch 'origin/feature/tweak-profile-modal-ui' into feature/updated-user-config-handling 2 years ago
ThreadPickerVC.swift Replaced Cocoapods with Swift Package Manager for dependency management 8 months ago
ThreadPickerViewModel.swift Replaced Cocoapods with Swift Package Manager for dependency management 8 months ago