Merge remote-tracking branch 'origin/v13/dev' into v14/dev

# Conflicts:
#	src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts
This commit is contained in:
Bjarke Berg
2024-01-10 08:35:58 +01:00
29 changed files with 354 additions and 194 deletions

View File

@@ -19,4 +19,7 @@ public class RichTextEditorConfiguration
[DataMember(Name = "customConfig")]
public IDictionary<string, string>? CustomConfig { get; set; }
[DataMember(Name = "cloudApiKey")]
public string? CloudApiKey { get; set; }
}