session-ios/SessionMessagingKit
Morgan Pretty d8b0f76902 Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Database/LegacyDatabase/SMKLegacy.swift
#	SessionMessagingKit/Database/Models/Interaction.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+Calls.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+DataExtractionNotification.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+VisibleMessages.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+ConvoInfoVolatile.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionMessagingKitTests/Open Groups/OpenGroupAPISpec.swift
#	SessionMessagingKitTests/Sending & Receiving/MessageReceiverSpec.swift
#	SessionSnodeKit/Database/LegacyDatabase/SSKLegacy.swift
#	SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
#	SessionUtilitiesKit/Database/LegacyDatabase/SUKLegacy.swift
#	SessionUtilitiesKit/Database/Migrations/_003_YDBToGRDBMigration.swift
#	SessionUtilitiesKit/General/SNUserDefaults.swift
#	SignalUtilitiesKit/Utilities/AppVersion.m
2023-09-26 11:45:45 +10:00
..
Calls Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2023-09-26 11:32:03 +10:00
Common Networking Added in missing code changes unrelated to closed groups rebuild 2022-12-08 14:21:38 +11:00
Database Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 2023-09-26 11:45:45 +10:00
File Server Reworked SnodeAPI auth and prepared requests 2023-09-07 08:53:37 +10:00
Jobs/Types Fixed build errors and cleaned up Dependencies interface further 2023-09-19 18:13:37 +10:00
Messages Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 2023-09-26 11:45:45 +10:00
Meta Theming tweaks and bug fixes 2022-10-14 17:09:38 +11:00
Open Groups Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 2023-09-26 11:45:45 +10:00
Protos Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2023-09-26 11:32:03 +10:00
Sending & Receiving Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 2023-09-26 11:45:45 +10:00
SessionUtil Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 2023-09-26 11:45:45 +10:00
Shared Models Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 2023-09-26 11:45:45 +10:00
Utilities Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 2023-09-26 11:45:45 +10:00
Configuration.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2023-09-26 11:32:03 +10:00