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 1db80dfa13 Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Calls/CallVC.swift
#	Session/Calls/WebRTC/WebRTCSession+MessageHandling.swift
#	Session/Calls/WebRTC/WebRTCSession.swift
#	Session/Meta/AppDelegate.swift
#	Session/Utilities/Permissions.swift
#	SessionMessagingKit/Sending & Receiving/Errors/MessageReceiverError.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionUtilitiesKit/General/SNUserDefaults.swift
3 months ago
..
Context Menu Fixed a bunch of QA issues 3 months ago
Emoji Picker Merge remote-tracking branch 'RyanFork/strings' into feature/groups-rebuild 6 months ago
Input View Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 3 months ago
Message Cells Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 3 months ago
Settings Fixed a number of QA issues and other bugs founds 3 months ago
Views & Modals Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 3 months ago
ConversationSearch.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 3 months ago
ConversationVC+Interaction.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 3 months ago
ConversationVC.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 3 months ago
ConversationViewModel.swift Fixed a few more QA issues 3 months ago