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 7165b9e4f6 Merge branch 'dev' into feature/remove-OWSBlockingManager
# Conflicts:
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Meta/AppDelegate.swift
#	SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
3 years ago
..
Control Messages Merge branch 'dev' into feature/remove-OWSBlockingManager 3 years ago
Signal avoid conflicts with call beta in TSInfoMessageType 3 years ago
Visible Messages remove useless expiration flag in data message 3 years ago
Message+Destination.swift Merge branch 'dev' into cleanup 4 years ago
Message.swift store hash value for outgoing messages 4 years ago