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 v11/dev

Browse Source 
# Conflicts:
#	.gitignore
This commit is contained in:
Bjarke Berg
2022-10-12 10:48:40 +02:00
parent 5bd796d73f 30e016afb3
commit 8ebeb32469
11 changed files with 44 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@@ -102,9 +102,8 @@ preserve.belle
# Ignore auto-generated schema
/src/Umbraco.Cms.Targets/appsettings-schema.json
/src/Umbraco.Cms.Targets/appsettings-schema.*.json
/src/Umbraco.Web.UI/appsettings-schema.json
/src/Umbraco.Web.UI/appsettings-schema.umbraco.json
/src/Umbraco.Web.UI/appsettings-schema.*.json
/tests/Umbraco.Tests.Integration/appsettings-schema.json
/src/Umbraco.Cms.Targets/appsettings-schema.json
/src/Umbraco.Cms.Targets/appsettings-schema.umbraco.json
/tests/Umbraco.Tests.Integration/appsettings-schema.*.json