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

Merge branch 'v12/dev' into v13/dev

Browse Source 
# Conflicts:
#	build/azure-pipelines.yml
#	src/Umbraco.Core/Configuration/Models/SecuritySettings.cs
#	version.json
This commit is contained in:
kjac
2023-10-22 11:23:04 +02:00
parent b0ca3444f4 2c572c6f72
commit 3169ff9581
236 changed files with 4701 additions and 2603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Infrastructure/Models/MediaWithCrops.cs
View File

@@ -63,7 +63,7 @@ public class MediaWithCrops<T> : MediaWithCrops
public new T Content { get; }
/// <summary>
/// Performs an implicit conversion from <see cref="MediaWithCrops{T}" /> to <see cref="T" />.
/// Performs an implicit conversion from <see cref="MediaWithCrops{T}" /> to <typeparamref name="T"/>.
/// </summary>
/// <param name="mediaWithCrops">The media with crops.</param>
/// <returns>