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 5d88db7a8a Merge remote-tracking branch 'origin/feature/tweak-profile-modal-ui' into feature/updated-user-config-handling
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Calls/Call Management/SessionCall.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/Input View/MentionSelectionView.swift
#	Session/Conversations/Message Cells/VisibleMessageCell.swift
#	Session/Settings/SettingsViewModel.swift
#	Session/Shared/Views/SessionAvatarCell.swift
#	Session/Shared/Views/SessionCell+AccessoryView.swift
#	SessionUIKit/Components/ConfirmationModal.swift
#	SessionUIKit/Components/PlaceholderIcon.swift
#	SignalUtilitiesKit/Profile Pictures/ProfilePictureView.swift
1 year ago
..
Views Merge remote-tracking branch 'origin/feature/tweak-profile-modal-ui' into feature/updated-user-config-handling 1 year ago
AppearanceViewController.swift Translations, better RTL support and minor animation fix 2 years ago
BlockedContactsViewModel.swift Sorted out a bunch of the config syncing logic 2 years ago
ConversationSettingsViewModel.swift Added in missing code changes unrelated to closed groups rebuild 2 years ago
HelpViewModel.swift Added logic to include the commit hash in the logs for debug builds 1 year ago
ImagePickerHandler.swift Merge remote-tracking branch 'origin/feature/tweak-profile-modal-ui' into feature/updated-user-config-handling 1 year ago
NotificationContentViewModel.swift Added in missing code changes unrelated to closed groups rebuild 2 years ago
NotificationSettingsViewModel.swift Added in missing code changes unrelated to closed groups rebuild 2 years ago
NotificationSoundViewModel.swift Added in missing code changes unrelated to closed groups rebuild 2 years ago
NukeDataModal.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 1 year ago
PrivacySettingsViewModel.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 1 year ago
QRCodeVC.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 1 year ago
SeedModal.swift Updated the profile picture management UI 1 year ago
SettingsViewModel.swift Merge remote-tracking branch 'origin/feature/tweak-profile-modal-ui' into feature/updated-user-config-handling 1 year ago