Patrick Barron 01ce56016a Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj # MediaBrowser.Api/UserService.cs # MediaBrowser.Controller/Library/IUserManager.cs		2020-05-26 20:29:11 -04:00
..
EmbyTV	Add GetLoopbackHttpApiUrl() helper method to replace forceHttps functionality	2020-05-10 14:36:11 -04: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	Remove redundant qualifiers	2020-05-20 13:07:53 -04:00
LiveTvMediaSourceProvider.cs	Address comments	2020-04-01 19:05:41 +02:00
RefreshChannelsScheduledTask.cs	Fix some warnings	2019-11-22 16:15:31 +01:00