session-ios/Session/Meta
Morgan Pretty 1db80dfa13 Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Calls/CallVC.swift
#	Session/Calls/WebRTC/WebRTCSession+MessageHandling.swift
#	Session/Calls/WebRTC/WebRTCSession.swift
#	Session/Meta/AppDelegate.swift
#	Session/Utilities/Permissions.swift
#	SessionMessagingKit/Sending & Receiving/Errors/MessageReceiverError.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionUtilitiesKit/General/SNUserDefaults.swift
..
AudioFiles
Countries Tweaks to IP deduping logic, fixed a CSV parsing bug, re-ran script
Fonts
Images.xcassets Fixed a bunch of QA issues
Mnemonic
Settings.bundle Fixed the broken unit tests
Translations Fixed a few more QA issues
TurnServers
AppDelegate.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
Launch Screen.storyboard
MainAppContext.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
PrivacyInfo.xcprivacy Added missing keys to the privacy info file
Session+SNUIKit.swift Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild
Session-Info.plist Merge remote-tracking branch 'upstream/dev' into standardised-strings
SessionApp.swift Fixed a number of QA issues and other bugs founds
Signal.entitlements
SignalTSan.supp
SignalUBSan.supp Moved a bunch of networking logic into libSession
StartupError.swift Merge branch 'dev' into standardised-strings