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
Morgan Pretty 2800a11cf3 Merge remote-tracking branch 'upstream/dev' into fix/quote-with-attachment
# Conflicts:
#	Session/Media Viewing & Editing/MessageInfoScreen.swift
7 months ago
..
Context Menu fix issues 8 months ago
Emoji Picker Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 1 year ago
Input View Merge branch 'feature/groups-rebuild' of https://github.com/mpretty-cyro/session-ios into feedback-for-actions 8 months ago
Message Cells Merge remote-tracking branch 'upstream/dev' into fix/quote-with-attachment 7 months ago
Settings Merge pull request #407 from mpretty-cyro/fix/display-name-accessibility-ids 7 months ago
Views & Modals Merge remote-tracking branch 'upstream/dev' into call-detailed-info 7 months ago
ConversationSearch.swift Updated searching to use a publisher and cancel it (instead of db interrupt) 8 months ago
ConversationVC+Interaction.swift Merge remote-tracking branch 'upstream/dev' into call-detailed-info 7 months ago
ConversationVC.swift Merge remote-tracking branch 'upstream/dev' into call-detailed-info 7 months ago
ConversationViewModel.swift Added support for rendering quotes with attachments and bug fixes 7 months ago