4 Commits

Author	SHA1	Message	Date
Bjarke Berg	a91d708bc5	cleanup	2021-11-03 12:11:05 +01:00
Bjarke Berg	fb953ad532	Only run this test on windows	2021-11-03 12:10:42 +01:00
Bjarke Berg	ab96e7c17d	fix for linux+mac	2021-11-03 09:11:30 +01:00
Bjarke Berg	c3ebbe23fd	Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge_v8_03-11-2021 ... # Conflicts: # src/Umbraco.Core/Configuration/GlobalSettings.cs # src/Umbraco.Core/Configuration/IGlobalSettings.cs # src/Umbraco.Core/Constants-AppSettings.cs # src/Umbraco.Tests/Umbraco.Tests.csproj # src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs # src/Umbraco.Web.UI/umbraco/config/lang/en.xml # src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml # src/Umbraco.Web.UI/web.Template.config # src/Umbraco.Web/Editors/ContentTypeController.cs # src/Umbraco.Web/HealthCheck/Checks/Security/BaseHttpHeaderCheck.cs # tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configurations/LanguageXmlTests.cs	2021-11-03 08:44:12 +01:00