Bjarke Berg
a28168667b
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
# Conflicts:
# src/Umbraco.Core/Editors/BackOfficePreviewModel.cs
# src/Umbraco.Core/Models/IconModel.cs
# src/Umbraco.Web.BackOffice/Controllers/IconController.cs
# src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs
# src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
# src/Umbraco.Web.UI/config/umbracoSettings.config
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/BackOfficeModel.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs