Bjarke Berg
926c74dcba
Merge remote-tracking branch 'origin/v8/feature/version-history-cleanup-ui' into v9/feature/merge_and_clean_history_cleanup
# Conflicts:
# src/Umbraco.Core/Models/ContentType.cs
# src/Umbraco.Core/Models/Mapping/ContentTypeMapDefinition.cs
# src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web/Models/ContentEditing/HistoryCleanup.cs
# tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs
# tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs