alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-01 11:52:52 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into support-injecting-iconfiguration

Browse Source
This commit is contained in:
Mark Monteiro
2020-03-03 22:27:49 +01:00
parent 7e3b6768f8 5276c75cde
commit 76957213e6
27 changed files with 455 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jellyfin.Server/Program.cs
View File

@@ -26,6 +26,7 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Serilog;
using Serilog.Events;
using Serilog.Extensions.Logging;
using SQLitePCL;
using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -262,6 +263,7 @@ namespace Jellyfin.Server
}
})
.ConfigureAppConfiguration(config => config.ConfigureAppConfiguration(appPaths))
.UseSerilog()
.UseContentRoot(appHost.ContentRoot)
.ConfigureServices(services =>
{