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/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
11 months ago
..
project.xcworkspace Rename project 4 years ago
xcshareddata Trying to progress on the CI builds 12 months ago
project.pbxproj Merge remote-tracking branch 'upstream/dev' into feature/job-runner-unit-tests 11 months ago