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
|
2023-05-26 17:54:45 +10:00 |