You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		5 years ago
..
EmbyTV	Merge pull request #2767 from Bond-009/nullable3	5 years ago
Listings	Enable Microsoft.CodeAnalysis.FxCopAnalyzers for Jellyfin.Common	5 years ago
TunerHosts	Merge pull request #3072 from JustAMan/fix-dead-livetv	5 years ago
LiveTvConfigurationFactory.cs	Address comments	5 years ago
LiveTvDtoService.cs	Merge remote-tracking branch 'upstream/master' into register-services-correctly	5 years ago
LiveTvManager.cs	Merge branch 'master' into userdb-efcore	5 years ago
LiveTvMediaSourceProvider.cs	Address comments	5 years ago
RefreshChannelsScheduledTask.cs	Enable TreatWarningsAsErrors for Jellyfin.Server.Implementations in Release mode	5 years ago