Stepan Goremykin 38d962242a Merge branch 'master' into fix-resharper-warnings ... # Conflicts: # Emby.Server.Implementations/Updates/InstallationManager.cs # tests/Jellyfin.Server.Integration.Tests/OpenApiSpecTests.cs		2023-10-14 00:45:52 +02:00
..
ChannelDynamicMediaSourceProvider.cs
ChannelImageProvider.cs
ChannelManager.cs	Merge branch 'master' into fix-resharper-warnings	2023-10-14 00:45:52 +02:00
ChannelPostScanTask.cs
RefreshChannelsScheduledTask.cs	Fix some warnings	2022-02-15 18:59:46 +01:00