|  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 | 3 years ago | 
				
					
						|  Ryan Zhao | b6b99fac69 | refactor: use view model for reaction button | 3 years ago | 
				
					
						|  Ryan Zhao | c91bdb3aeb | refactor: persist recent used emojis | 3 years ago | 
				
					
						|  Ryan Zhao | c33680fe70 | do not show number when there is only 1 react per emoji in 1-1 convos | 3 years ago | 
				
					
						|  Ryan Zhao | 76aac26f7e | redo reaction list sheet with collection view | 3 years ago | 
				
					
						|  ryanzhao | b5c7902833 | WIP: reactions list | 3 years ago | 
				
					
						|  Ryan Zhao | 5feb87f069 | ui: add interaction to reaction view | 4 years ago | 
				
					
						|  Ryan Zhao | 9d795d4bfb | ui: add expand react button | 4 years ago | 
				
					
						|  Ryan Zhao | 3239aa521e | add border to reacts including current user | 4 years ago | 
				
					
						|  ryanzhao | 692df74af6 | wip: emoji reacts message cell ui | 4 years ago |