Sebastiaan Janssen
|
024a57e098
|
Merge branch 'v12/dev' into v13/dev
# Conflicts:
# global.json
# src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
# src/Umbraco.Cms.StaticAssets/wwwroot/App_Plugins/Umbraco.BlockGridEditor.DefaultCustomViews/umbBlockGridDemoRichTextBlock.html
# src/Umbraco.Core/EmbeddedResources/Lang/da.xml
# src/Umbraco.Core/EmbeddedResources/Lang/en.xml
# src/Umbraco.Core/EmbeddedResources/Lang/tr.xml
# src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
# src/Umbraco.Infrastructure/BackgroundJobs/Jobs/HealthCheckNotifierJob.cs
# src/Umbraco.Infrastructure/BackgroundJobs/RecurringBackgroundJobHostedServiceRunner.cs
# src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
# src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
# src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
# src/Umbraco.Web.UI/Startup.cs
# tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts
# tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackgroundJobs/Jobs/HealthCheckNotifierJobTests.cs
(cherry picked from commit ef3f2c48198d8baed9d3340f926cd07e80720428)
|
2023-12-06 12:47:51 +01:00 |
|