Patrick Barron aca7e221d8 Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs # Emby.Server.Implementations/ApplicationHost.cs # Emby.Server.Implementations/Devices/DeviceManager.cs # Jellyfin.Server/Jellyfin.Server.csproj # Jellyfin.Server/Migrations/MigrationRunner.cs # MediaBrowser.Controller/Devices/IDeviceManager.cs		2020-05-15 17:20:07 -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 #2774 from mark-monteiro/simplify-https-config	2020-05-13 20:36:54 +03: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	Initial migration code	2020-05-12 22:10:35 -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