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 c3b855646f Merge branch 'dev' into feature/session-id-blinding-part-2
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Views & Modals/JoinOpenGroupModal.swift
#	Session/Open Groups/JoinOpenGroupVC.swift
#	Session/Settings/SettingsVC.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
4 years ago
..
NotificationSettingsOptionsViewController.h Re-organize files 5 years ago
NotificationSettingsOptionsViewController.m Re-organize files 5 years ago
NotificationSettingsViewController.h Re-organize files 5 years ago
NotificationSettingsViewController.m Use newly translated strings 5 years ago
NukeDataModal.swift Merge branch 'dev' into feature/session-id-blinding-part-2 4 years ago
OWSSoundSettingsViewController.h Re-organize files 5 years ago
OWSSoundSettingsViewController.m Re-organize files 5 years ago
PrivacySettingsTableViewController.h Re-organize files 5 years ago
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 Merge branch 'dev' into feature/session-id-blinding-part-2 4 years ago
ShareLogsModal.swift include more info in logs 4 years ago