session-ios/Session.xcodeproj
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
..
project.xcworkspace Rename project 2021-01-11 15:01:59 +11:00
xcshareddata Trying to progress on the CI builds 2023-07-12 15:03:42 +10:00
project.pbxproj Merge remote-tracking branch 'upstream/dev' into feature/updated-push-server 2023-08-02 14:35:16 +10:00