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/Control 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
..
CallMessage.swift Merge remote-tracking branch 'upstream/dev' into strings 7 months ago
ClosedGroupControlMessage.swift fix group control messages 7 months ago
ControlMessage.swift Cleared out some of the legacy serialisation logic, further UI binding 3 years ago
DataExtractionNotification.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 11 months ago
ExpirationTimerUpdate.swift WIP: refactor expiration update message 8 months ago
MessageRequestResponse.swift remove attached disappearing messages settings for some control messages 1 year ago
ReadReceipt.swift refactor on the way that attaching disappearing messages config to messages 1 year ago
TypingIndicator.swift fix untouched strings 1 year ago
UnsendRequest.swift fix unsend requests 1 year ago