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/Session
Morgan Pretty be7881ad2e Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Conversations/Views & Modals/ConversationTitleView.swift
#	Session/Notifications/AppNotifications.swift
#	Session/Settings/NukeDataModal.swift
#	Session/Shared/SessionTableViewModel.swift
#	Session/Shared/Views/SessionCell.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Database/Models/Contact.swift
#	SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
#	SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift
#	SessionMessagingKit/Messages/Message.swift
#	SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
#	SessionMessagingKit/Protos/Generated/SNProto.swift
#	SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift
#	SessionMessagingKit/Protos/SessionProtos.proto
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift
#	SessionMessagingKitTests/_TestUtilities/TestOnionRequestAPI.swift
#	SessionSnodeKit/Models/SnodeAPIEndpoint.swift
#	SessionSnodeKit/SnodeAPI.swift
#	SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
#	SessionUtilitiesKit/General/Features.swift
2 years ago
..
Backups Merge branch 'remove-unused-code' into voice-calls-2 3 years ago
Calls Updated to the latest libSession, fixed remaining items 2 years ago
Closed Groups Fixed an accessibility regression 2 years ago
Conversations Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 2 years ago
Dependencies Remove SwiftCSV 4 years ago
Emoji Further config util logic 2 years ago
Home Fixed a few bugs and build libSession-util from source 2 years ago
Media Viewing & Editing Fixed issues found during QA 2 years ago
Meta Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 2 years ago
Notifications Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 2 years ago
Onboarding Fixed a few bugs and build libSession-util from source 2 years ago
Open Groups Updated to the latest libSession, fixed remaining items 2 years ago
Path Fixed the QA issues and a few other bugs 2 years ago
Settings Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 2 years ago
Shared Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 2 years ago
Utilities Accessibility and copy tweaks 2 years ago
.swiftlint.yml Fix target naming 4 years ago