Morgan Pretty 7d47a36f9f Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling ... # Conflicts: # Session/Conversations/ConversationVC+Interaction.swift # Session/Conversations/Settings/ThreadSettingsViewModel.swift # Session/Home/Message Requests/MessageRequestsViewController.swift # Session/Shared/Views/SessionAvatarCell.swift # SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ClosedGroups.swift # SessionMessagingKit/Sending & Receiving/MessageSender.swift		2023-03-06 18:02:26 +11:00
..
OWSMessageTimerView.h	Progressing on theming functionality	2022-08-12 13:35:17 +10:00
OWSMessageTimerView.m	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-01-27 14:26:17 +11:00
ProfilePictureVC.swift	Fixed search performance, started styling in-conversaiton settings	2022-09-07 17:37:01 +10:00
ThreadDisappearingMessagesSettingsViewModel.swift	Fixed a number of bugs with the config handling	2023-03-06 15:20:15 +11:00
ThreadSettingsViewModel.swift	Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling	2023-03-06 18:02:26 +11:00