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 ecd066f7a1 Merge remote-tracking branch 'upstream/dev' into strings
# Conflicts:
#	Session/Media Viewing & Editing/PhotoCaptureViewController.swift
#	Session/Notifications/AppNotifications.swift
#	Session/Settings/SettingsViewModel.swift
#	Session/Utilities/Permissions.swift
#	SessionMessagingKit/Messages/Control Messages/CallMessage.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
#	SessionShareExtension/ThreadPickerVC.swift
1 year ago
..
Views Merge branch 'dev' into standardised-strings 1 year ago
AppearanceViewController.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 1 year ago
BlockedContactsViewModel.swift fix unblock modals 1 year ago
ConversationSettingsViewModel.swift add some accessibility ids 1 year ago
HelpViewModel.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 1 year ago
ImagePickerHandler.swift Replaced Cocoapods with Swift Package Manager for dependency management 1 year ago
NotificationContentViewModel.swift WIP: add strings 2 years ago
NotificationSettingsViewModel.swift add some accessibility ids 1 year ago
NotificationSoundViewModel.swift plurals and fix some strings 1 year ago
NukeDataModal.swift Merge remote-tracking branch 'upstream/dev' into strings 1 year ago
PrivacySettingsViewModel.swift Merge branch 'dev' into standardised-strings 1 year ago
QRCodeScreen.swift Merge branch 'onboarding' into standardised-strings 1 year ago
RecoveryPasswordScreen.swift Merge branch 'dev' into standardised-strings 1 year ago
SeedModal.swift Merge branch 'onboarding' into standardised-strings 1 year ago
SettingsViewModel.swift Merge remote-tracking branch 'upstream/dev' into strings 1 year ago