session-ios/Session
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 branch 'dev' into disappearing-message-redesign 2023-09-21 11:59:57 +10:00
Closed Groups [WIP] Refactored dependency access to be more generic 2023-09-01 13:40:50 +10:00
Conversations Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 2023-09-26 11:45:45 +10:00
Dependencies Remove SwiftCSV 2021-01-27 14:09:19 +11:00
Emoji Refactored the LintLocalizableStrings 2023-09-25 18:32:56 +10:00
Home [WIP] Refactored dependency access to be more generic 2023-09-01 13:40:50 +10:00
Media Viewing & Editing Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 2023-09-26 11:45:45 +10:00
Meta Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 2023-09-26 11:45:45 +10:00
Notifications Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 2023-09-26 11:45:45 +10:00
Onboarding Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 2023-09-26 11:45:45 +10:00
Open Groups [WIP] Refactored dependency access to be more generic 2023-09-01 13:40:50 +10:00
Path [WIP] Refactored dependency access to be more generic 2023-09-01 13:40:50 +10:00
Settings Merge branch 'dev' into disappearing-message-redesign 2023-09-21 11:59:57 +10:00
Shared Fixed build errors and cleaned up Dependencies interface further 2023-09-19 18:13:37 +10:00
Utilities Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild 2023-09-26 11:45:45 +10:00
.swiftlint.yml Fix target naming 2020-11-11 18:42:06 +11:00