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 18ee9d34fa Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	SessionMessagingKit/Open Groups/Types/SodiumProtocols.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
#	SessionMessagingKitTests/_TestUtilities/MockAeadXChaCha20Poly1305Ietf.swift
#	SessionUtilitiesKit/JobRunner/JobRunner.swift
2 years ago
..
Base.lproj Fixed a number of bugs with the config handling 2 years ago
Meta Fixed a hang, removed redundant libs, files and code 2 years ago
SAEScreenLockViewController.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2 years ago
ShareAppExtensionContext.swift Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 2 years ago
ShareNavController.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 2 years 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 feature/updated-push-server 2 years ago
ThreadPickerViewModel.swift Fixed a number of issues found during internal testing 2 years ago