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
..
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-04 16:52:23 -04:00
ChannelPostScanTask.cs	Apply code review suggestions	2020-04-19 13:39:12 -04:00
RefreshChannelsScheduledTask.cs	Remove unused field and documented RefreshChannelsScheduledTask.cs	2020-04-14 15:48:06 -04:00