yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/15.0' into v15/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs
#	src/Umbraco.Core/Extensions/PublishedContentExtensions.cs
#	src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/tiptap-toolbar.element.ts
#	tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentNavigationServiceBaseTests.cs
This commit is contained in:
Bjarke Berg
2024-11-12 12:14:50 +01:00
parent 178c5dcb83 e38f6e8967
commit c9fa2a57d7
174 changed files with 3078 additions and 1599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/Umbraco.JsonSchema/UmbracoCmsSchema.cs
View File

@@ -1,5 +1,6 @@
using Umbraco.Cms.Core.Configuration;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Models;
internal class UmbracoCmsSchema
{
@@ -79,5 +80,6 @@ internal class UmbracoCmsSchema
public required MarketplaceSettings Marketplace { get; set; }
public required WebhookSettings Webhook { get; set; }
public required CacheSettings Cache { get; set; }
}
}