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

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging

Browse Source 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Runtime/BackOfficeComposer.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
This commit is contained in:
Mole
2020-09-22 13:49:25 +02:00
parent c0616d516a c2f343b17d
commit 1fdebb6bd9
18 changed files with 195 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web/Composing/Current.cs
View File

@@ -178,6 +178,9 @@ namespace Umbraco.Web.Composing
public static ISectionService SectionService
=> Factory.GetInstance<ISectionService>();
public static IIconService IconService
=> Factory.GetInstance<IIconService>();
#endregion
#region Web Constants