Files
Umbraco-CMS/src/Umbraco.Web.BackOffice/Controllers
Bjarke Berg 9aea7039d2 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/macros
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
2020-06-10 10:55:56 +02:00
..