Morgan Pretty fa39b5f61c Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling ... # Conflicts: # Session.xcodeproj/project.pbxproj # Session/Calls/CallVC.swift # Session/Conversations/Message Cells/Content Views/DocumentView.swift # Session/Conversations/Settings/OWSMessageTimerView.m # SessionMessagingKit/File Server/FileServerAPI.swift # SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift # SessionMessagingKit/Open Groups/OpenGroupManager.swift # SessionMessagingKit/Sending & Receiving/MessageReceiver.swift # SessionMessagingKit/Shared Models/MessageViewModel.swift # SessionMessagingKit/Shared Models/SessionThreadViewModel.swift # SessionSnodeKit/SnodeAPI.swift # SessionUtilitiesKit/Networking/HTTP.swift # SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentTextToolbar.swift		2023-04-13 13:22:39 +10:00
..
Combine	Updated to the latest version of libSession-util	2023-02-20 12:56:48 +11:00
Crypto	Removed usages of Box.KeyPair, removed a TODO	2023-03-10 09:42:36 +11:00
Database	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-04-06 18:09:26 +10:00
General	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-04-13 13:22:39 +10:00
JobRunner	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-04-13 13:22:39 +10:00
Media	Fixed a couple of bugs found during testing	2023-03-06 17:53:30 +11:00
Meta	A few bugs fixes and some optimisations	2022-08-19 16:58:47 +10:00
Networking	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-04-13 13:22:39 +10:00
Utilities	Finished off a few remaining bits and pieces	2023-03-08 17:27:07 +11:00
Configuration.swift	Fixed build issues, bugs, added unit tests and added the ConvoInfoVolatile handling	2023-02-01 18:12:36 +11:00