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 e59770170b Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Calls/Call Management/SessionCallManager+Action.swift
#	Session/Calls/Call Management/SessionCallManager+CXProvider.swift
#	Session/Calls/Call Management/SessionCallManager.swift
#	Session/Calls/WebRTC/WebRTCSession.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
#	Session/Media Viewing & Editing/PhotoCapture.swift
#	Session/Media Viewing & Editing/PhotoLibrary.swift
#	Session/Notifications/NotificationPresenter.swift
#	Session/Notifications/PushRegistrationManager.swift
#	Session/Settings/HelpViewModel.swift
#	SessionMessagingKit/Database/Models/LinkPreview.swift
#	SessionMessagingKit/Sending & Receiving/Attachments/SignalAttachment.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+LegacyClosedGroups.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+LegacyClosedGroups.swift
#	SessionNotificationServiceExtension/NotificationServiceExtension.swift
#	SessionShareExtension/ShareNavController.swift
#	SessionShareExtension/ThreadPickerVC.swift
#	SessionUtilitiesKit/Media/DataSource.swift
5 months ago
..
Views Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 5 months ago
AppearanceViewController.swift Reverted the isRTL changes (preferred the old approach) 7 months ago
BlockedContactsViewModel.swift Fixed a number of QA issues 5 months ago
ConversationSettingsViewModel.swift Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 8 months ago
DeveloperSettingsViewModel.swift Added additional settings controllable via env vars 5 months ago
HelpViewModel.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 5 months ago
ImagePickerHandler.swift Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 8 months ago
NotificationContentViewModel.swift Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 8 months ago
NotificationSettingsViewModel.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 6 months ago
NotificationSoundViewModel.swift Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 8 months ago
NukeDataModal.swift Fixed a number of QA issues 5 months ago
PrivacySettingsViewModel.swift Various dependency changes required to get unit tests working correctly 6 months ago
QRCodeScreen.swift Updated NTS & 1-1 conversation deletion to be consistent with other plats 6 months ago
RecoveryPasswordScreen.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 6 months ago
SeedModal.swift Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 8 months ago
SettingsViewModel.swift Fixed a number of QA issues 5 months ago