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
..
project.xcworkspace	Rename project	2021-01-11 15:01:59 +11:00
xcshareddata	Added toast and info message deletion, fixed layout issues & unit tests	2022-10-05 18:44:25 +11:00
project.pbxproj	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-04-13 13:22:39 +10:00