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/macros

Browse Source 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
This commit is contained in:
Bjarke Berg
2020-06-10 10:55:56 +02:00
parent 01433ee190 57a087861c
commit 9aea7039d2
92 changed files with 1628 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Tests/Testing/UmbracoTestBase.cs
View File

@@ -313,6 +313,7 @@ namespace Umbraco.Tests.Testing
Composition.RegisterUnique<ISectionService, SectionService>();
Composition.RegisterUnique<HtmlLocalLinkParser>();
Composition.RegisterUnique<IWebSecurity, WebSecurity>();
Composition.RegisterUnique<IEmailSender, EmailSender>();
Composition.RegisterUnique<HtmlUrlParser>();
Composition.RegisterUnique<HtmlImageSourceParser>();