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 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
..
ci-host Use keep-alive for simulators 1 year ago
DecryptExportedKey.swift Refactored the LintLocalizableStrings 2 years ago
EmojiGenerator.swift Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 7 months ago
GenerateLicenses.swift Fixed a couple of small bugs 7 months ago
LintLocalizableStrings.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 7 months ago
ProcessIP2CountryData.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 9 months ago
ProtoWrappers.py Fixed invalid python escape and added LOCAL_MIRROR arg to libSession 9 months ago
build_libSession_util.sh Fixed invalid python escape and added LOCAL_MIRROR arg to libSession 9 months ago
clean-up-old-test-simulators.sh Update to the latest build config 1 year ago
drone-static-upload.sh Tweaked the static upload script to ignore the branch name for tags 8 months ago
drone-upload-exists.sh Remove debug lines 1 year ago