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 6830c68c31 Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
# Conflicts:
#	Session/Calls/Call Management/SessionCall.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Meta/AppDelegate.swift
#	Session/Meta/MainAppContext.swift
#	Session/Notifications/PushRegistrationManager.swift
#	SessionMessagingKit/Jobs/GarbageCollectionJob.swift
#	SessionMessagingKit/Jobs/Types/UpdateProfilePictureJob.swift
#	SessionMessagingKit/LibSession/Config Handling/LibSession+Shared.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionMessagingKit/Utilities/ProfileManager.swift
#	SessionUtilitiesKit/Database/Storage.swift
#	SessionUtilitiesKit/JobRunner/JobRunner.swift
#	_SharedTestUtilities/SynchronousStorage.swift
9 months ago
..
AudioFiles
Countries Tweaks to IP deduping logic, fixed a CSV parsing bug, re-ran script 1 year ago
Fonts
Images.xcassets Fixed a bunch of QA issues 10 months ago
Mnemonic
Settings.bundle Fixed the broken unit tests 11 months ago
Translations Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 9 months ago
TurnServers fix: wrong server removed 2 years ago
AppDelegate.swift Database reentrancy fixes 9 months ago
Launch Screen.storyboard
MainAppContext.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 9 months 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 2 years ago
SessionApp.swift Fixed a number of QA issues and other bugs founds 10 months ago
Signal.entitlements
SignalTSan.supp
SignalUBSan.supp Moved a bunch of networking logic into libSession 2 years ago
StartupError.swift Merge branch 'dev' into standardised-strings 1 year ago