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

Merge remote-tracking branch 'origin/v8/dev' into netcore/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Web/Models/RegisterModel.cs
#	src/Umbraco.Web/UmbracoHelper.cs
This commit is contained in:
Bjarke Berg
2020-03-11 07:42:53 +01:00
parent 9d6762fb6a 39026258ec
commit da7552204d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,10 +115,10 @@ namespace Umbraco.Web.Composing
public static UmbracoHelper UmbracoHelper
=> Factory.GetInstance<UmbracoHelper>();
public static IUmbracoComponentRenderer UmbracoComponentRenderer
=> Factory.GetInstance<IUmbracoComponentRenderer>();
public static ITagQuery TagQuery
=> Factory.GetInstance<ITagQuery>();
public static DistributedCache DistributedCache
=> Factory.GetInstance<DistributedCache>();