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
..
Themes	Merge remote-tracking branch 'origin/feature/tweak-profile-modal-ui' into feature/updated-user-config-handling	2023-05-26 17:54:45 +10:00
Fonts.swift	Create SessionUIKit	2020-11-09 16:03:59 +11:00
Format.swift	Added in missing code changes unrelated to closed groups rebuild	2022-12-08 14:21:38 +11:00
ThemeManager.swift	Fixed issues found during testing	2022-10-07 15:35:17 +11:00
Values.swift	Merge remote-tracking branch 'origin/feature/tweak-profile-modal-ui' into feature/updated-user-config-handling	2023-05-26 17:54:45 +10:00