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 42b4f0aa2e Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj		4 years ago
..
ChannelDynamicMediaSourceProvider.cs	…
ChannelImageProvider.cs	Merge branch 'master' into warnings-cleanup1	5 years ago
ChannelManager.cs	Merge branch 'master' into userdb-efcore	4 years ago
ChannelPostScanTask.cs	…
RefreshChannelsScheduledTask.cs	Use typed logger where possible	5 years ago