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 |