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		2023-08-02 14:35:16 +10:00
..
Base.lproj	Fixed a number of bugs with the config handling	2023-03-06 15:20:15 +11:00
Meta	Fixed a hang, removed redundant libs, files and code	2023-06-29 16:58:23 +10:00
SAEScreenLockViewController.swift	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-05-18 17:34:25 +10:00
ShareAppExtensionContext.swift	Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests	2023-07-18 10:02:51 +10:00
ShareNavController.swift	Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server	2023-08-02 14:35:16 +10:00
SimplifiedConversationCell.swift	Merge remote-tracking branch 'origin/feature/tweak-profile-modal-ui' into feature/updated-user-config-handling	2023-05-26 17:54:45 +10:00
ThreadPickerVC.swift	Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server	2023-08-02 14:35:16 +10:00
ThreadPickerViewModel.swift	Fixed a number of issues found during internal testing	2023-06-23 17:54:29 +10:00