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/SessionUIKit
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
2 years ago
..
Components Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 2 years ago
Database/Migrations Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 2 years ago
Meta Create SessionUIKit 5 years ago
Style Guide Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 2 years ago
Types Fixed an accessibility regression 2 years ago
Utilities Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2 years ago
Configuration.swift CI tweaks and incremented build number 2 years ago