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 7165b9e4f6 Merge branch 'dev' into feature/remove-OWSBlockingManager
# Conflicts:
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Meta/AppDelegate.swift
#	SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
4 years ago
..
NotificationSettingsOptionsViewController.h
NotificationSettingsOptionsViewController.m
NotificationSettingsViewController.h
NotificationSettingsViewController.m Use newly translated strings 5 years ago
NukeDataModal.swift Merge branch 'dev' into feature/remove-OWSBlockingManager 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 Cleaned up some config sync logic and allowed migrations to trigger them 4 years ago
ShareLogsModal.swift include more info in logs 4 years ago