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 840e01d847 Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerCell.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
#	Session/Media Viewing & Editing/PhotoCapture.swift
#	Session/Media Viewing & Editing/PhotoLibrary.swift
#	Session/Meta/Settings.bundle/Root.plist
#	Session/Meta/Translations/InfoPlist.xcstrings
#	SessionMessagingKit/Database/Models/Attachment.swift
#	SessionMessagingKit/Database/Models/LinkPreview.swift
#	SessionMessagingKit/Sending & Receiving/Attachments/SignalAttachment.swift
#	SessionMessagingKitTests/LibSession/LibSessionUtilSpec.swift
#	SessionShareExtension/ShareNavController.swift
#	SessionShareExtension/ThreadPickerVC.swift
#	SessionSnodeKit/LibSession/LibSession+Networking.swift
#	SessionUtilitiesKit/Configuration.swift
#	SessionUtilitiesKit/Media/Data+Image.swift
#	SessionUtilitiesKit/Media/DataSource.swift
#	SignalUtilitiesKit/Configuration.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentApprovalViewController.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorModel.swift
#	_SharedTestUtilities/NimbleExtensions.swift
7 months ago
..
AudioFiles add silence audio file 3 years ago
Countries Tweaks to IP deduping logic, fixed a CSV parsing bug, re-ran script 9 months ago
Fonts Fix missing font 4 years ago
Images.xcassets Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 7 months ago
Mnemonic Debug 5 years ago
Settings.bundle Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 7 months ago
Translations Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 7 months ago
TurnServers fix: wrong server removed 1 year ago
AppDelegate.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 7 months ago
Launch Screen.storyboard Updated the app settings screens 3 years ago
MainAppContext.swift Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 7 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 7 months 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 7 months ago
Signal.entitlements Removed the iCloud entitlements 2 years ago
SignalTSan.supp Organize files 5 years ago
SignalUBSan.supp Moved a bunch of networking logic into libSession 1 year ago
StartupError.swift Merge branch 'dev' into standardised-strings 8 months ago