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 2bcd8e28ab Merge remote-tracking branch 'upstream/dev' into standardised-strings
# Conflicts:
#	Scripts/LintLocalizableStrings.swift
#	Session.xcodeproj/project.pbxproj
#	Session/Closed Groups/EditClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Message Cells/Content Views/QuoteView.swift
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Conversations/Views & Modals/ConversationTitleView.swift
#	Session/Home/GlobalSearch/GlobalSearchViewController.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
#	Session/Media Viewing & Editing/PhotoCaptureViewController.swift
#	Session/Media Viewing & Editing/PhotoLibrary.swift
#	Session/Notifications/UserNotificationsAdaptee.swift
#	Session/Open Groups/JoinOpenGroupVC.swift
#	Session/Settings/NukeDataModal.swift
#	Session/Shared/ScanQRCodeWrapperVC.swift
#	SessionMessagingKit/Database/Models/Attachment.swift
#	SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
#	SessionMessagingKit/Database/Models/RecipientState.swift
#	SessionMessagingKit/Sending & Receiving/Attachments/SignalAttachment.swift
#	SessionShareExtension/ShareNavController.swift
#	SessionShareExtension/ThreadPickerVC.swift
#	SessionUIKit/Components/TopBannerController.swift
#	SessionUtilitiesKit/General/String+Utilities.swift
#	SessionUtilitiesKit/Networking/IPv4.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentApprovalInputAccessoryView.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentApprovalViewController.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentCaptionToolbar.swift
#	SignalUtilitiesKit/Screen Lock/ScreenLock.swift
1 year ago
..
AudioFiles
Countries Tweaks to IP deduping logic, fixed a CSV parsing bug, re-ran script 1 year ago
Fonts
Images.xcassets bring back the recovery phrase bannner 2 years ago
Mnemonic
Settings.bundle Moved a bunch of networking logic into libSession 2 years ago
Translations clean with constants 1 year ago
TurnServers fix: wrong server removed 2 years ago
AppDelegate.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 1 year ago
AppEnvironment.swift Replaced Cocoapods with Swift Package Manager for dependency management 1 year ago
Launch Screen.storyboard
MainAppContext.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 1 year ago
PrivacyInfo.xcprivacy Added missing keys to the privacy info file 2 years ago
Session-Info.plist Merge remote-tracking branch 'upstream/dev' into standardised-strings 1 year ago
SessionApp.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 1 year ago
Signal-Bridging-Header.h clean 2 years ago
Signal.entitlements Removed the iCloud entitlements 3 years ago
SignalTSan.supp
SignalUBSan.supp Moved a bunch of networking logic into libSession 2 years ago