Bjarke Berg
85c01d9905
Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
# Conflicts:
# src/Umbraco.Configuration/Legacy/GlobalSettings.cs
# src/Umbraco.Core/Configuration/IGlobalSettings.cs
# src/Umbraco.Core/Models/ContentBaseExtensions.cs
# src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs
# src/Umbraco.Core/Routing/DefaultUrlProvider.cs
# src/Umbraco.Core/Runtime/MainDom.cs
# src/Umbraco.Core/Services/IRuntimeState.cs
# src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
# src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
# src/Umbraco.Infrastructure/RuntimeState.cs
# src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
# src/Umbraco.Tests/Runtimes/StandaloneTests.cs
# src/Umbraco.Tests/TestHelpers/TestObjects.cs
# src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs
# src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
# src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
# src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs
# src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs
# src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
# src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
# src/Umbraco.Web/Controllers/UmbLoginController.cs
# src/Umbraco.Web/Install/Controllers/InstallController.cs
# src/Umbraco.Web/PublishedElementExtensions.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
# src/Umbraco.Web/UmbracoHelper.cs
# src/Umbraco.Web/UmbracoInjectedModule.cs
# src/Umbraco.Web/UrlHelperExtensions.cs
# src/Umbraco.Web/UrlHelperRenderExtensions.cs
# src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs