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/SessionMessagingKit/Messages
Morgan Pretty ecd066f7a1 Merge remote-tracking branch 'upstream/dev' into strings
# Conflicts:
#	Session/Media Viewing & Editing/PhotoCaptureViewController.swift
#	Session/Notifications/AppNotifications.swift
#	Session/Settings/SettingsViewModel.swift
#	Session/Utilities/Permissions.swift
#	SessionMessagingKit/Messages/Control Messages/CallMessage.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
#	SessionShareExtension/ThreadPickerVC.swift
7 months ago
..
Control Messages Merge remote-tracking branch 'upstream/dev' into strings 7 months ago
Signal Merge branch 'feature/session-id-blinding-part-2' into feature/database-refactor 3 years ago
Visible Messages Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago
Message+Destination.swift Replaced Cocoapods with Swift Package Manager for dependency management 8 months ago
Message+DisappearingMessages.swift Separate streams for attachment upload/download and bug fixes 10 months ago
Message+Origin.swift Replaced Cocoapods with Swift Package Manager for dependency management 8 months ago
Message.swift Merge remote-tracking branch 'upstream/dev' into feature/swift-package-manager 8 months ago