Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj		2020-06-13 19:41:05 -04:00
..
ChannelDynamicMediaSourceProvider.cs	Clean up and document ChannelManager.cs and implement suggestions	2020-04-15 15:00:45 -04:00
ChannelImageProvider.cs	Merge branch 'master' into warnings-cleanup1	2020-04-22 13:44:20 +00:00
ChannelManager.cs	Merge branch 'master' into userdb-efcore	2020-06-13 19:41:05 -04:00
ChannelPostScanTask.cs	Apply code review suggestions	2020-04-19 13:39:12 -04:00
RefreshChannelsScheduledTask.cs	Use typed logger where possible	2020-06-05 18:15:56 -06:00