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/Meta/Translations
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
..
InfoPlist.xcstrings Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 7 months ago
Localizable.xcstrings merge latest translation & bump up build number 7 months ago
TRANSLATIONS.md Organize files 5 years ago
remove_unused_strings.swift Added some more tests and cleaned up some warnings 2 years ago