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 07f765b716 Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Session/Meta/Translations/InfoPlist.xcstrings
#	Session/Settings/SettingsViewModel.swift
#	SessionUIKit/Components/ConfirmationModal.swift
7 months ago
..
project.xcworkspace Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 7 months ago
xcshareddata Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 7 months ago
project.pbxproj Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 7 months ago