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 ecd066f7a1 Merge remote-tracking branch 'upstream/dev' into strings
# Conflicts:
#	Session/Media Viewing & Editing/PhotoCaptureViewController.swift
#	Session/Notifications/AppNotifications.swift
#	Session/Settings/SettingsViewModel.swift
#	Session/Utilities/Permissions.swift
#	SessionMessagingKit/Messages/Control Messages/CallMessage.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
#	SessionShareExtension/ThreadPickerVC.swift
7 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 standardised-strings 7 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 standardised-strings 7 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 Merge remote-tracking branch 'upstream/dev' into strings 7 months ago
ThreadPickerViewModel.swift Replaced Cocoapods with Swift Package Manager for dependency management 8 months ago