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/Settings
Morgan Pretty 63be502434 Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionSnodeKit/Networking/SnodeAPI.swift
#	SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
#	SessionUtilitiesKit/General/Dictionary+Utilities.swift
#	SessionUtilitiesKit/JobRunner/JobRunner.swift
2 years ago
..
Views
AppearanceViewController.swift
BlockedContactsViewModel.swift
ConversationSettingsViewModel.swift
HelpViewModel.swift
ImagePickerHandler.swift Merge remote-tracking branch 'origin/feature/tweak-profile-modal-ui' into feature/updated-user-config-handling 2 years ago
NotificationContentViewModel.swift
NotificationSettingsViewModel.swift
NotificationSoundViewModel.swift Fixed a number of issues found during internal testing 2 years ago
NukeDataModal.swift
PrivacySettingsViewModel.swift
QRCodeVC.swift
SeedModal.swift
SettingsViewModel.swift