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/Meta
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
1 year ago
..
AudioFiles add silence audio file 2 years ago
Certificates Updated the seed node certificates and removed the workaround 1 year ago
Countries
Fonts
Images.xcassets replace icon image with system SF Font 1 year ago
Mnemonic
Settings.bundle Further refactoring work 2 years ago
Translations Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
TurnServers add session turn server info 2 years ago
AppDelegate.swift Merge remote-tracking branch 'origin/feature/updated-user-config-handling' into disappearing-message-redesign 1 year ago
AppEnvironment.swift Further config util logic 2 years ago
Launch Screen.storyboard Updated the app settings screens 2 years ago
MainAppContext.h
MainAppContext.m Further config util logic 2 years ago
Session-Info.plist Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
SessionApp.swift Cleaned up a bunch of code, added pinned and hidden handling 1 year ago
Signal-Bridging-Header.h Added in missing code changes unrelated to closed groups rebuild 2 years ago
Signal.entitlements Removed the iCloud entitlements 1 year ago
SignalTSan.supp
SignalUBSan.supp