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

Merge branch 'netcore/dev' into netcore/feature/in-memory-runtime-minifier

Browse Source 
# Conflicts:
#	src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
This commit is contained in:
Shannon
2021-03-16 17:49:05 +11:00
parent 193bf6c51e bd08adf2c7
commit 670bea81d1
61 changed files with 1140 additions and 752 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web.UI.NetCore/Views/_ViewImports.cshtml
View File

@@ -1,5 +1,6 @@
@using Umbraco.Extensions
@using Umbraco.Extensions
@using Umbraco.Cms.Web.UI.NetCore
@using Umbraco.Cms.Web.Common.PublishedModels
@using Umbraco.Cms.Web.Common.Views
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@addTagHelper *, Umbraco.Cms.Web.UI.NetCore