Patrick Barron 06f9cde22f Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs # Emby.Server.Implementations/Library/UserManager.cs # Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs # Emby.Server.Implementations/Sorting/IsPlayedComparer.cs # Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs # Emby.Server.Implementations/TV/TVSeriesManager.cs # Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs		2020-06-04 16:52:23 -04:00
..
EmbyTV	Merge pull request #2767 from Bond-009/nullable3	2020-06-03 12:26:54 +03:00
Listings	Enable Microsoft.CodeAnalysis.FxCopAnalyzers for Jellyfin.Common	2020-04-02 20:12:18 +02: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