cfa8f6c6ec
Conflicts: MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs |
||
---|---|---|
.. | ||
ChannelConfigurations.cs | ||
ChannelDynamicMediaSourceProvider.cs | ||
ChannelImageProvider.cs | ||
ChannelManager.cs | ||
ChannelPostScanTask.cs | ||
RefreshChannelsScheduledTask.cs |