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
..
Database/Migrations	Merge branch 'feature/session-id-blinding-part-2' into feature/database-refactor	2022-06-08 14:29:51 +10:00
Media Viewing & Editing	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-05-18 17:34:25 +10:00
Meta	Added in missing code changes unrelated to closed groups rebuild	2022-12-08 14:21:38 +11:00
Screen Lock	Further config util logic	2022-12-07 15:06:15 +11:00
Shared View Controllers	Updated to the latest libSession, fixed remaining items	2023-04-14 12:39:18 +10:00
Shared Views	Removed some unneeded imports	2022-12-07 15:54:56 +11:00
Utilities	Fixed a few bugs and build libSession-util from source	2023-04-21 16:34:06 +10:00
Configuration.swift	Increased the file upload size to 10Mb	2022-12-21 09:10:47 +11:00