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 e59770170b Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Calls/Call Management/SessionCallManager+Action.swift
#	Session/Calls/Call Management/SessionCallManager+CXProvider.swift
#	Session/Calls/Call Management/SessionCallManager.swift
#	Session/Calls/WebRTC/WebRTCSession.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
#	Session/Media Viewing & Editing/PhotoCapture.swift
#	Session/Media Viewing & Editing/PhotoLibrary.swift
#	Session/Notifications/NotificationPresenter.swift
#	Session/Notifications/PushRegistrationManager.swift
#	Session/Settings/HelpViewModel.swift
#	SessionMessagingKit/Database/Models/LinkPreview.swift
#	SessionMessagingKit/Sending & Receiving/Attachments/SignalAttachment.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+LegacyClosedGroups.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+LegacyClosedGroups.swift
#	SessionNotificationServiceExtension/NotificationServiceExtension.swift
#	SessionShareExtension/ShareNavController.swift
#	SessionShareExtension/ThreadPickerVC.swift
#	SessionUtilitiesKit/Media/DataSource.swift
5 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 9 months ago
SAEScreenLockViewController.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 9 months ago
ShareAppExtensionContext.swift Removed FileSystem and use a properly injected FileManagerType everywhere 7 months ago
ShareNavController.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 5 months ago
SimplifiedConversationCell.swift Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild 10 months ago
ThreadPickerVC.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 5 months ago
ThreadPickerViewModel.swift Breaking GroupsKeys change, QA issue fixes 5 months ago