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/SessionMessagingKit/Calls
Morgan Pretty f262b6d7a8 Merge remote-tracking branch 'upstream/dev' into fix/inconsistent-deletion-behaviours
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Calls/Call Management/SessionCallManager.swift
#	Session/Notifications/PushRegistrationManager.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+Calls.swift
#	SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+MessageRequests.swift
10 months ago
..
CallManagerProtocol.swift Various dependency changes required to get unit tests working correctly 11 months ago
CallMode.swift Fixed all of the build errors from merge, migrated Call logic, started idBlinding migration and bug fixes 3 years ago
CurrentCallProtocol.swift Merge remote-tracking branch 'upstream/dev' into fix/inconsistent-deletion-behaviours 10 months ago
EndCallMode.swift Fixed all of the build errors from merge, migrated Call logic, started idBlinding migration and bug fixes 3 years ago
NoopSessionCallManager.swift Various dependency changes required to get unit tests working correctly 11 months ago