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

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

Browse Source 
# Conflicts:
#	Directory.Build.props
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
This commit is contained in:
Bjarke Berg
2023-12-22 14:19:04 +01:00
parent fc71724386 8b82addd53
commit 1e849ad539
11 changed files with 349 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
templates/Umbraco.Templates.csproj
View File

@@ -42,6 +42,7 @@
</Content>
</ItemGroup>
<!-- Update template.json files with the default UmbracoVersion value set to the current build version -->
<ItemGroup>
<PackageReference Include="Umbraco.JsonSchema.Extensions" PrivateAssets="all" />