mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 05:47:14 -04:00
# Conflicts: # Emby.Dlna/Emby.Dlna.csproj # Emby.Dlna/Eventing/DlnaEventManager.cs # Emby.Dlna/Service/BaseService.cs # Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs # MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs |
||
---|---|---|
.. | ||
EmbyTV | ||
Listings | ||
TunerHosts | ||
LiveTvConfigurationFactory.cs | ||
LiveTvDtoService.cs | ||
LiveTvManager.cs | ||
LiveTvMediaSourceProvider.cs | ||
RefreshChannelsScheduledTask.cs |