Morgan Pretty c25f378c54 Merge branch 'feature/database-refactor' into emoji-reacts ... # Conflicts: # Session.xcodeproj/project.pbxproj # Session/Conversations/Context Menu/ContextMenuVC+Action.swift # Session/Conversations/Context Menu/ContextMenuVC+ActionView.swift # Session/Conversations/Context Menu/ContextMenuVC.swift # Session/Conversations/ConversationVC+Interaction.swift # Session/Conversations/ConversationVC.swift # Session/Conversations/ConversationViewItem.h # Session/Conversations/ConversationViewItem.m # Session/Conversations/Message Cells/Content Views/LinkPreviewView.swift # Session/Conversations/Message Cells/MessageCell.swift # Session/Conversations/Message Cells/VisibleMessageCell.swift # Session/Conversations/Views & Modals/BodyTextView.swift # Session/Meta/Translations/en.lproj/Localizable.strings # Session/Shared/UserCell.swift # SessionMessagingKit/Jobs/MessageSendJob.swift # SessionMessagingKit/Messages/Signal/TSMessage.h # SessionMessagingKit/Messages/Signal/TSMessage.m # SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift # SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift # SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift # SessionMessagingKit/Sending & Receiving/Notifications/NotificationsProtocol.h # SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift # SessionMessagingKit/Utilities/General.swift # SessionNotificationServiceExtension/NSENotificationPresenter.swift # SignalUtilitiesKit/Utilities/DisplayableText.swift # SignalUtilitiesKit/Utilities/NoopNotificationsManager.swift # SignalUtilitiesKit/Utilities/Notification+Loki.swift		2022-07-25 15:39:56 +10:00
..
ExpandingAttachmentsButton.swift	Got the ability to send message working again and other tweaks	2022-05-06 12:44:26 +10:00
InputTextView.swift	Got the ability to send message working again and other tweaks	2022-05-06 12:44:26 +10:00
InputView.swift	Merge branch 'feature/database-refactor' into emoji-reacts	2022-07-25 15:39:56 +10:00
InputViewButton.swift	Applied the "increase min version to iOS 13" changes	2022-07-01 13:33:00 +10:00
MentionSelectionView.swift	Fixed all of the build errors from merge, migrated Call logic, started idBlinding migration and bug fixes	2022-06-09 18:37:44 +10:00
VoiceMessageRecordingView.swift	Got the ability to send message working again and other tweaks	2022-05-06 12:44:26 +10:00