Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj		2020-06-13 19:41:05 -04:00
..
EmbyTV	Merge pull request #3254 from crobibero/ilogger	2020-06-13 00:29:43 +09:00
Listings	Merge pull request #3254 from crobibero/ilogger	2020-06-13 00:29:43 +09:00
TunerHosts	undo erroneous changes	2020-06-05 18:29:58 -06:00
LiveTvConfigurationFactory.cs	Address comments	2020-04-01 19:05:41 +02:00
LiveTvDtoService.cs	Use typed logger where possible	2020-06-05 18:15:56 -06:00
LiveTvManager.cs	Merge branch 'master' into userdb-efcore	2020-06-13 19:41:05 -04:00
LiveTvMediaSourceProvider.cs	Use typed logger where possible	2020-06-05 18:15:56 -06:00
RefreshChannelsScheduledTask.cs	Enable TreatWarningsAsErrors for Jellyfin.Server.Implementations in Release mode	2020-05-29 11:28:19 +02:00