Merge branch 'dev-v7' into temp8
# Conflicts: # src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs # src/Umbraco.Tests/CodeFirst/StronglyTypedMapperTest.cs # src/Umbraco.Tests/LibraryTests.cs # src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs # src/Umbraco.Tests/PublishedContent/DynamicDocumentTestsBase.cs # src/Umbraco.Tests/PublishedContent/PublishedContentDataTableTests.cs # src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs # src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs # src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs # src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs # src/Umbraco.Tests/TestHelpers/BaseWebTest.cs # src/Umbraco.Web.UI/Umbraco/config/lang/da.xml # src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml # src/Umbraco.Web.UI/umbraco/config/lang/en.xml # src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml # src/Umbraco.Web.UI/umbraco/config/lang/es.xml # src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs # src/Umbraco.Web/WebBootManager.cs
This commit is contained in:
Sebastiaan Janssen