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 5ca227434b Merge branch 'dev' into feature/session-id-blinding-part-2
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Utilities/BackgroundPoller.swift
#	SessionMessagingKit/Database/Storage+OpenGroups.swift
#	SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
#	SessionMessagingKit/Open Groups/OpenGroupManagerV2.swift
#	SessionMessagingKit/Sending & Receiving/MessageSender.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift
#	SessionMessagingKit/Storage.swift
#	SessionMessagingKit/Utilities/General.swift
#	SessionSnodeKit/SnodeAPI.swift
#	SessionUtilitiesKit/General/Atomic.swift
4 years ago
..
NotificationSettingsOptionsViewController.h
NotificationSettingsOptionsViewController.m
NotificationSettingsViewController.h
NotificationSettingsViewController.m Use newly translated strings 5 years ago
NukeDataModal.swift Updated the cachedEncodedPublicKey to be Atomic 4 years ago
OWSSoundSettingsViewController.h
OWSSoundSettingsViewController.m
PrivacySettingsTableViewController.h
PrivacySettingsTableViewController.m Fix view controller popping animation bug 5 years ago
QRCodeVC.swift Fixed a couple of crashes 4 years ago
SeedModal.swift Clean 5 years ago
SettingsVC.swift File upload working, further code cleanup 4 years ago
ShareLogsModal.swift include more info in logs 4 years ago