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
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
1 year ago
..
AudioFiles add silence audio file 3 years ago
Countries Tweaks to IP deduping logic, fixed a CSV parsing bug, re-ran script 1 year ago
Fonts Fix missing font 4 years ago
Images.xcassets Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 1 year ago
Mnemonic Debug 5 years ago
Settings.bundle Merge remote-tracking branch 'origin/feature/swift-package-manager' into feature/groups-rebuild 1 year ago
Translations Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 1 year ago
TurnServers fix: wrong server removed 2 years ago
AppDelegate.swift Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 1 year ago
Launch Screen.storyboard Updated the app settings screens 3 years ago
MainAppContext.swift Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 1 year ago
PrivacyInfo.xcprivacy Added missing keys to the privacy info file 2 years ago
Session+SNUIKit.swift Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 1 year ago
Session-Info.plist Merge remote-tracking branch 'upstream/dev' into standardised-strings 1 year ago
SessionApp.swift Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 1 year ago
Signal.entitlements Removed the iCloud entitlements 3 years ago
SignalTSan.supp Organize files 5 years ago
SignalUBSan.supp Moved a bunch of networking logic into libSession 2 years ago
StartupError.swift Merge branch 'dev' into standardised-strings 1 year ago