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 ecd066f7a1 Merge remote-tracking branch 'upstream/dev' into strings
# Conflicts:
#	Session/Media Viewing & Editing/PhotoCaptureViewController.swift
#	Session/Notifications/AppNotifications.swift
#	Session/Settings/SettingsViewModel.swift
#	Session/Utilities/Permissions.swift
#	SessionMessagingKit/Messages/Control Messages/CallMessage.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
#	SessionShareExtension/ThreadPickerVC.swift
7 months ago
..
Context Menu Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago
Emoji Picker clean useless identifier 7 months ago
Input View Merge branch 'onboarding' into standardised-strings 11 months ago
Message Cells Merge remote-tracking branch 'upstream/dev' into strings 7 months ago
Settings fix group leaving modal to respect group admins 7 months ago
Views & Modals fix disappearing messages strings 7 months ago
ConversationSearch.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago
ConversationVC+Interaction.swift Merge remote-tracking branch 'upstream/dev' into strings 7 months ago
ConversationVC.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago
ConversationViewModel.swift remove unused block/unblock toast 7 months ago