session-ios/Session.xcodeproj
Morgan Pretty b471a32209 Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests
# Conflicts:
#	Session/Conversations/ConversationVC+Interaction.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPI.swift
#	SessionMessagingKit/Open Groups/OpenGroupManager.swift
2023-08-01 14:39:00 +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/job-runner-unit-tests 2023-08-01 14:39:00 +10:00