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 a6931bb922 Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Shared/SessionTableViewController.swift
#	Session/Shared/SessionTableViewModel.swift
#	Session/Shared/Types/SessionTableSection.swift
#	SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
#	SessionUIKit/Components/SessionButton.swift
2 years ago
..
Views Fixed a crash on the blocked contacts screen and refactoring 2 years ago
AppearanceViewController.swift Fixed a few more PN logic issues 2 years ago
BlockedContactsViewModel.swift Fixed a crash on the blocked contacts screen and refactoring 2 years ago
ConversationSettingsViewModel.swift Fixed a crash on the blocked contacts screen and refactoring 2 years ago
HelpViewModel.swift Fixed a crash on the blocked contacts screen and refactoring 2 years ago
ImagePickerHandler.swift Fixed a few more PN logic issues 2 years ago
NotificationContentViewModel.swift Fixed a crash on the blocked contacts screen and refactoring 2 years ago
NotificationSettingsViewModel.swift Fixed a crash on the blocked contacts screen and refactoring 2 years ago
NotificationSoundViewModel.swift Fixed a crash on the blocked contacts screen and refactoring 2 years ago
NukeDataModal.swift Merge branch 'dev' into disappearing-message-redesign 2 years ago
PrivacySettingsViewModel.swift Fixed a crash on the blocked contacts screen and refactoring 2 years ago
QRCodeVC.swift Change the 'Grant Camera Access' copy to 'Continue' at Apple's request 2 years ago
SeedModal.swift Fixes for user config crashes 2 years ago
SettingsViewModel.swift Fixed a crash on the blocked contacts screen and refactoring 2 years ago