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
..
Base.lproj	Fixed a number of bugs with the config handling	2023-03-06 15:20:15 +11:00
Meta	Further config util logic	2022-12-07 15:06:15 +11:00
SAEScreenLockViewController.swift	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-05-18 17:34:25 +10:00
ShareAppExtensionContext.swift	Further config util logic	2022-12-07 15:06:15 +11:00
ShareNavController.swift	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-05-18 17:34:25 +10:00
SimplifiedConversationCell.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
ThreadPickerVC.swift	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-05-18 17:34:25 +10:00
ThreadPickerViewModel.swift	Finished of the Conversation screen and JobQueue concurrency	2022-05-31 17:41:02 +10:00