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
..
VisibleMessage+Attachment.swift	Fixed a number of minor bugs, started re-connecting chat bubble interactions	2022-05-11 18:20:10 +10:00
VisibleMessage+LinkPreview.swift	Fixed a number of minor bugs, started re-connecting chat bubble interactions	2022-05-11 18:20:10 +10:00
VisibleMessage+OpenGroupInvitation.swift	Fixed a number of minor bugs, started re-connecting chat bubble interactions	2022-05-11 18:20:10 +10:00
VisibleMessage+Profile.swift	Further config util logic	2022-12-07 15:06:15 +11:00
VisibleMessage+Quote.swift	Merge branch 'feature/database-refactor' into emoji-reacts	2022-07-25 15:39:56 +10:00
VisibleMessage+Reaction.swift	Merge branch 'feature/database-refactor' into emoji-reacts	2022-07-25 15:39:56 +10:00
VisibleMessage.swift	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-04-13 13:22:39 +10:00