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

Merge remote-tracking branch 'origin/temp8' into temp8-I3089

Browse Source 
# Conflicts:
#	src/Umbraco.Web/Trees/DataTypeTreeController.cs
This commit is contained in:
Shannon
2018-10-08 09:54:12 +02:00
parent 99257f2245 b6679551d4
commit b48202197f
201 changed files with 9580 additions and 4378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
View File

@@ -233,7 +233,7 @@ namespace Umbraco.Core.Migrations.Install
private void CreateLanguageData()
{
_database.Insert(Constants.DatabaseSchema.Tables.Language, "id", false, new LanguageDto { Id = 1, IsoCode = "en-US", CultureName = "English (United States)", IsDefaultVariantLanguage = true });
_database.Insert(Constants.DatabaseSchema.Tables.Language, "id", false, new LanguageDto { Id = 1, IsoCode = "en-US", CultureName = "English (United States)", IsDefault = true });
}
private void CreateContentChildTypeData()