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/Scripts
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
8 months ago
..
ci-host Use keep-alive for simulators 1 year ago
DecryptExportedKey.swift Refactored the LintLocalizableStrings 2 years ago
EmojiGenerator.swift Refactored the LintLocalizableStrings 2 years ago
LintLocalizableStrings.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago
ProcessIP2CountryData.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago
ProtoWrappers.py Fixed invalid python escape and added LOCAL_MIRROR arg to libSession 8 months ago
build_libSession_util.sh Fixed invalid python escape and added LOCAL_MIRROR arg to libSession 8 months ago
clean-up-old-test-simulators.sh Update to the latest build config 1 year ago
drone-static-upload.sh Added some debugging code for the upload exists script 1 year ago
drone-upload-exists.sh Remove debug lines 1 year ago