You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
session-ios/Session/Conversations/Context Menu
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
1 year ago
..
ContextMenuVC+Action.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 1 year ago
ContextMenuVC+ActionView.swift add accessibility labels for automation test 2 years ago
ContextMenuVC+EmojiReactsView.swift Did some more styling and fixed a few UI bugs 2 years ago
ContextMenuVC.swift Added a secondary fallback for the timestamp in the context menu 1 year ago
ContextMenuWindow.swift Work on the PromiseKit refactor 2 years ago