Patrick Barron 7a115024aa Merge branch 'master' into userdb-efcore ... # Conflicts: # MediaBrowser.Controller/Library/ILibraryManager.cs # MediaBrowser.Providers/Users/UserMetadataService.cs		2020-06-11 18:23:12 -04:00
..
EmbyTV	Fix a small number of compile warnings	2020-06-06 20:17:49 +01:00
Listings	Fix a small number of compile warnings	2020-06-06 20:17:49 +01:00
TunerHosts	Merge pull request #3072 from JustAMan/fix-dead-livetv	2020-05-18 23:23:47 +09:00
LiveTvConfigurationFactory.cs	Address comments	2020-04-01 19:05:41 +02:00
LiveTvDtoService.cs	Merge remote-tracking branch 'upstream/master' into register-services-correctly	2020-04-20 20:11:33 -04:00
LiveTvManager.cs	Merge branch 'master' into userdb-efcore	2020-06-04 16:52:23 -04:00
LiveTvMediaSourceProvider.cs	Address comments	2020-04-01 19:05:41 +02:00
RefreshChannelsScheduledTask.cs	Enable TreatWarningsAsErrors for Jellyfin.Server.Implementations in Release mode	2020-05-29 11:28:19 +02:00