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/Call Management
Morgan Pretty fa39b5f61c Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Calls/CallVC.swift
#	Session/Conversations/Message Cells/Content Views/DocumentView.swift
#	Session/Conversations/Settings/OWSMessageTimerView.m
#	SessionMessagingKit/File Server/FileServerAPI.swift
#	SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
#	SessionMessagingKit/Open Groups/OpenGroupManager.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
#	SessionMessagingKit/Shared Models/MessageViewModel.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionSnodeKit/SnodeAPI.swift
#	SessionUtilitiesKit/Networking/HTTP.swift
#	SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentTextToolbar.swift
2 years ago
..
SessionCall.swift Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2 years ago
SessionCallManager+Action.swift Renamed GRDBStorage to Storage (no use having the prefix anymore since the old DB is deprecated) 3 years ago
SessionCallManager+CXCallController.swift Fixed all of the build errors from merge, migrated Call logic, started idBlinding migration and bug fixes 3 years ago
SessionCallManager+CXProvider.swift Further config util logic 2 years ago
SessionCallManager.swift Further config util logic 2 years ago