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/Control Messages
Morgan Pretty 18b296bcd8 Merge branch 'disappearing-message-redesign' into feature/drop-yap-database-support
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Meta/AppDelegate.swift
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/es-ES.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fr.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.lproj/Localizable.strings
#	Session/Meta/Translations/pl.lproj/Localizable.strings
#	Session/Meta/Translations/pt-BR.lproj/Localizable.strings
#	Session/Meta/Translations/ru.lproj/Localizable.strings
#	Session/Meta/Translations/sk.lproj/Localizable.strings
#	Session/Meta/Translations/zh-CN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-TW.lproj/Localizable.strings
#	SessionMessagingKit/Database/LegacyDatabase/SMKLegacy.swift
#	SessionMessagingKit/Database/Migrations/_003_YDBToGRDBMigration.swift
#	SessionMessagingKit/Messages/Control Messages/ConfigurationMessage.swift
#	SessionSnodeKit/Database/LegacyDatabase/SSKLegacy.swift
#	SessionSnodeKit/Database/Migrations/_003_YDBToGRDBMigration.swift
#	SessionUtilitiesKit/Database/LegacyDatabase/SUKLegacy.swift
#	SessionUtilitiesKit/Database/Migrations/_003_YDBToGRDBMigration.swift
2 years ago
..
CallMessage.swift fix an issue where call messages were not attached with disappearing messages setting 2 years ago
ClosedGroupControlMessage.swift Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 3 years ago
ControlMessage.swift Cleared out some of the legacy serialisation logic, further UI binding 4 years ago
DataExtractionNotification.swift Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 3 years ago
ExpirationTimerUpdate.swift Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 3 years ago
LegacyConfigurationMessage.swift Merge branch 'disappearing-message-redesign' into feature/drop-yap-database-support 2 years ago
MessageRequestResponse.swift Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 3 years ago
ReadReceipt.swift Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 3 years ago
SharedConfigMessage.swift Merge branch 'updated-user-config-handling' into disappearing-message-redesign 2 years ago
TypingIndicator.swift Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 3 years ago
UnsendRequest.swift Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 3 years ago