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

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

Browse Source 
# Conflicts:
#	src/Umbraco.Cms.ManagementApi/Umbraco.Cms.ManagementApi.csproj
#	src/Umbraco.Infrastructure/Cache/DistributedCacheBinder_Handlers.cs
This commit is contained in:
Bjarke Berg
2023-11-13 18:40:11 +01:00
parent e0220cb47f 74cfd9c9a0
commit 633f649be9
16 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,5 @@
<ItemGroup>
<ProjectReference Include="..\..\src\Umbraco.Core\Umbraco.Core.csproj" />
<ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
</ItemGroup>
</Project>