starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-24 01:34:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into NetworkPR2

Browse Source
This commit is contained in:
BaronGreenback
2020-10-26 13:21:48 +00:00
committed by GitHub
parent 1ee1f9c8a7 a814d01f8c
commit 0b5ddc90ff
164 changed files with 984 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jellyfin.Server/Program.cs
View File

@@ -340,7 +340,7 @@ namespace Jellyfin.Server
.ConfigureServices(services =>
{
// Merge the external ServiceCollection into ASP.NET DI
services.TryAdd(serviceCollection);
services.Add(serviceCollection);
})
.UseStartup<Startup>();
}