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 e420ce4e58 Merge remote-tracking branch 'upstream/dev' into onboarding
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Onboarding/PNModeVC.swift
#	SessionUIKit/Style Guide/Values.swift
11 months ago
..
project.xcworkspace Rename project 4 years ago
xcshareddata Cleaned up a bunch of warnings, renamed a couple of folders 1 year ago
project.pbxproj Merge remote-tracking branch 'upstream/dev' into onboarding 11 months ago