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
..
OWSMessageTimerView.h	Progressing on theming functionality	2022-08-12 13:35:17 +10:00
OWSMessageTimerView.m	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-04-13 13:22:39 +10:00
ProfilePictureVC.swift	Fixed search performance, started styling in-conversaiton settings	2022-09-07 17:37:01 +10:00
ThreadDisappearingMessagesSettingsViewModel.swift	Fixed a build issue	2023-04-26 11:57:30 +10:00
ThreadSettingsViewModel.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