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

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

Browse Source 
# Conflicts:
#	version.json
This commit is contained in:
Bjarke Berg
2023-05-23 12:23:27 +02:00
parent 38aacfc30a c878567633
commit 8f5f7f72fa
48 changed files with 837 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs
View File

@@ -15,7 +15,7 @@ public class ConnectionStrings // TODO: Rename to [Umbraco]ConnectionString (sin
/// <summary>
/// The DataDirectory placeholder.
/// </summary>
public const string DataDirectoryPlaceholder = ConfigurationExtensions.DataDirectoryPlaceholder;
public const string DataDirectoryPlaceholder = Constants.System.DataDirectoryPlaceholder;
/// <summary>
/// The postfix used to identify a connection strings provider setting.