yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/temp8' into temp8-logviewer

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Web.UI.Client/gulpfile.js
#	src/Umbraco.Web.UI/config/trees.Release.config
#	src/Umbraco.Web.UI/config/trees.config
This commit is contained in:
Warren Buckley
2019-01-21 11:17:14 +00:00
parent e27ea962d9 a32c8b3a68
commit f6154a38d9
690 changed files with 12673 additions and 20562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Logging/Serilog/LoggerConfigExtensions.cs
View File

@@ -92,7 +92,7 @@ namespace Umbraco.Core.Logging.Serilog
/// <summary>
/// Reads settings from /config/serilog.user.config
/// That allows a seperate logging pipeline to be configured that wil not affect the main Umbraco log
/// That allows a separate logging pipeline to be configured that wil not affect the main Umbraco log
/// </summary>
/// <param name="logConfig">A Serilog LoggerConfiguration</param>
public static LoggerConfiguration ReadFromUserConfigFile(this LoggerConfiguration logConfig)