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 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
..
Call Management Merge remote-tracking branch 'upstream/dev' into strings 7 months ago
Views & Modals Merge remote-tracking branch 'upstream/dev' into standardised-strings 8 months ago
WebRTC move webRTC constants to its own file 7 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 standardised-strings 8 months ago
CameraManager.swift Replaced Cocoapods with Swift Package Manager for dependency management 8 months ago
VideoPreviewVC.swift WIP: check for any untouched strings 1 year ago