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 d9a64e0148 Merge remote-tracking branch 'upstream/dev' into standardised-strings
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Closed Groups/EditClosedGroupVC.swift
#	Session/Closed Groups/NewClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/Emoji Picker/EmojiPickerCollectionView.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Emoji/Emoji+Available.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
#	Session/Meta/AppDelegate.swift
#	Session/Meta/SessionApp.swift
#	Session/Onboarding/PNModeVC.swift
#	Session/Path/PathVC.swift
#	Session/Utilities/IP2Country.swift
#	SessionMessagingKit/Messages/Control Messages/SharedConfigMessage.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPoller.swift
#	SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift
#	SessionNotificationServiceExtension/NotificationError.swift
#	SessionUIKit/Style Guide/Values.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentCaptionToolbar.swift
12 months ago
..
Context Menu Merge remote-tracking branch 'upstream/dev' into standardised-strings 12 months ago
Emoji Picker WIP: strings! 1 year ago
Input View Updated the CI sim build command to use unbuffered io 12 months ago
Message Cells minor refactor on getting app name 12 months ago
Settings Merge remote-tracking branch 'upstream/dev' into standardised-strings 12 months ago
Views & Modals Merge remote-tracking branch 'upstream/dev' into standardised-strings 12 months ago
ConversationSearch.swift rename dynamic variables in strings 1 year ago
ConversationVC+Interaction.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 12 months ago
ConversationVC.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 12 months ago
ConversationViewModel.swift Merge remote-tracking branch 'upstream/dev' into standardised-strings 12 months ago