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/Calls
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
10 months ago
..
Call Management Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 10 months ago
Views & Modals Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 10 months ago
WebRTC Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 10 months ago
CallVC+Camera.swift Fixed search performance, started styling in-conversaiton settings 3 years ago
CallVC.swift Merge remote-tracking branch 'upstream/dev' into feature/groups-rebuild 10 months ago
CameraManager.swift Replaced Cocoapods with Swift Package Manager for dependency management 1 year ago
VideoPreviewVC.swift WIP: check for any untouched strings 2 years ago