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
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
1 year ago
..
Calls Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 1 year ago
Common Networking Added in missing code changes unrelated to closed groups rebuild 2 years ago
Database Merge remote-tracking branch 'origin/feature/drop-yap-database-support' into feature/groups-rebuild 1 year ago
File Server Pushing up my WIP changes from the last few days 2 years ago
Jobs Merge remote-tracking branch 'origin/feature/drop-yap-database-support' into feature/groups-rebuild 1 year ago
Messages Merge remote-tracking branch 'origin/feature/drop-yap-database-support' into feature/groups-rebuild 1 year ago
Meta Refactored AppContext and AppRediness to Swift 1 year ago
Open Groups Added some more tests and fixed up some others 1 year ago
Protos Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 1 year ago
Sending & Receiving Merge remote-tracking branch 'origin/feature/drop-yap-database-support' into feature/groups-rebuild 1 year ago
SessionUtil Merge remote-tracking branch 'origin/feature/drop-yap-database-support' into feature/groups-rebuild 1 year ago
Shared Models Merge remote-tracking branch 'origin/feature/drop-yap-database-support' into feature/groups-rebuild 1 year ago
Utilities Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 1 year ago
Configuration.swift Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 1 year ago