kjac
5d2a90f974
Merge branch 'v13/dev' into v13/feature/extension-model
# Conflicts:
# src/Umbraco.Cms.Api.Management/Controllers/Package/PackageControllerBase.cs
# src/Umbraco.Cms.Api.Management/DependencyInjection/PackageBuilderExtensions.cs
# src/Umbraco.Cms.Api.Management/ManagementApiComposer.cs
# src/Umbraco.Core/CompatibilitySuppressions.xml
# src/Umbraco.Infrastructure/CompatibilitySuppressions.xml
# src/Umbraco.Infrastructure/Serialization/ContextualJsonSerializer.cs
# src/Umbraco.Web.BackOffice/CompatibilitySuppressions.xml