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 e59770170b Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Calls/Call Management/SessionCallManager+Action.swift
#	Session/Calls/Call Management/SessionCallManager+CXProvider.swift
#	Session/Calls/Call Management/SessionCallManager.swift
#	Session/Calls/WebRTC/WebRTCSession.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
#	Session/Media Viewing & Editing/PhotoCapture.swift
#	Session/Media Viewing & Editing/PhotoLibrary.swift
#	Session/Notifications/NotificationPresenter.swift
#	Session/Notifications/PushRegistrationManager.swift
#	Session/Settings/HelpViewModel.swift
#	SessionMessagingKit/Database/Models/LinkPreview.swift
#	SessionMessagingKit/Sending & Receiving/Attachments/SignalAttachment.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+LegacyClosedGroups.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+LegacyClosedGroups.swift
#	SessionNotificationServiceExtension/NotificationServiceExtension.swift
#	SessionShareExtension/ShareNavController.swift
#	SessionShareExtension/ThreadPickerVC.swift
#	SessionUtilitiesKit/Media/DataSource.swift
5 months ago
..
AudioFiles
Countries Tweaks to IP deduping logic, fixed a CSV parsing bug, re-ran script 9 months ago
Fonts
Images.xcassets Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 8 months ago
Mnemonic
Settings.bundle Fixed the broken unit tests 5 months ago
Translations Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 5 months ago
TurnServers
AppDelegate.swift Fixed a number of QA issues 5 months ago
Launch Screen.storyboard
MainAppContext.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 6 months ago
PrivacyInfo.xcprivacy Added missing keys to the privacy info file 1 year ago
Session+SNUIKit.swift Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 8 months ago
Session-Info.plist Merge remote-tracking branch 'upstream/dev' into standardised-strings 1 year ago
SessionApp.swift Breaking GroupsKeys change, QA issue fixes 5 months ago
Signal.entitlements
SignalTSan.supp
SignalUBSan.supp Moved a bunch of networking logic into libSession 1 year ago
StartupError.swift Merge branch 'dev' into standardised-strings 9 months ago