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 7cc6e32ed9 Merge remote-tracking branch 'origin/feature/drop-yap-database-support' into feature/groups-rebuild
# Conflicts:
#	.drone.jsonnet
#	Podfile.lock
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
#	SessionMessagingKit/Jobs/DisappearingMessagesJob.swift
#	SessionMessagingKit/Messages/Message.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+DataExtractionNotification.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+LegacyClosedGroups.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+VisibleMessages.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+Contacts.swift
#	SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+UserGroups.swift
#	SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+UserProfile.swift
#	SessionUtilitiesKit/General/Features.swift
2 years ago
..
Control Messages Merge remote-tracking branch 'upstream/dev' into feature/drop-yap-database-support 2 years ago
Signal Merge branch 'feature/session-id-blinding-part-2' into feature/database-refactor 4 years ago
Visible Messages Merge remote-tracking branch 'origin/feature/drop-yap-database-support' into feature/groups-rebuild 2 years ago
LibSessionMessage.swift Plugged in some more libSession functions and added more unit tests 2 years ago
Message+Destination.swift Removed 'fileIds' from Message.Destination (tested and won't break) 2 years ago
Message+DisappearingMessages.swift Merge remote-tracking branch 'origin/feature/drop-yap-database-support' into feature/groups-rebuild 2 years ago
Message+Origin.swift Updated logic to prepare for updated group message crypto 2 years ago
Message.swift Merge remote-tracking branch 'origin/feature/drop-yap-database-support' into feature/groups-rebuild 2 years ago