be88efce3c
# Conflicts: # Emby.Server.Implementations/Devices/DeviceManager.cs # Emby.Server.Implementations/HttpServer/Security/SessionContext.cs # Emby.Server.Implementations/Security/AuthenticationRepository.cs # Emby.Server.Implementations/Session/SessionManager.cs # Jellyfin.Server.Implementations/Security/AuthorizationContext.cs # MediaBrowser.Controller/Library/IUserManager.cs # MediaBrowser.Controller/Net/ISessionContext.cs |
||
---|---|---|
.. | ||
Device.cs | ||
DeviceInfo.cs | ||
MediaChangedEventArgs.cs | ||
PlaybackProgressEventArgs.cs | ||
PlaybackStartEventArgs.cs | ||
PlaybackStoppedEventArgs.cs | ||
PlaylistItem.cs | ||
PlaylistItemFactory.cs | ||
PlayToController.cs | ||
PlayToManager.cs | ||
SsdpHttpClient.cs | ||
TransportCommands.cs | ||
TransportState.cs | ||
uBaseObject.cs | ||
UpnpContainer.cs | ||
uPnpNamespaces.cs |