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

Merge remote-tracking branch 'origin/v10/dev' into v11/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Routing/UmbracoRequestPaths.cs
This commit is contained in:
Bjarke Berg
2023-03-29 10:29:44 +02:00
parent f8e5205aa7 83ad463e81
commit 61a33c734c
22 changed files with 3872 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/Umbraco.JsonSchema/Umbraco.JsonSchema.csproj
View File

@@ -12,7 +12,5 @@
<ItemGroup>
<ProjectReference Include="..\..\src\Umbraco.Core\Umbraco.Core.csproj" />
<PackageReference Include="Umbraco.Deploy.Core" Version="10.1.3" />
<PackageReference Include="Umbraco.Forms.Core" Version="10.2.3" />
</ItemGroup>
</Project>