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

# Conflicts: # src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs # src/Umbraco.Core/Models/Mapping/DictionaryMapDefinition.cs # src/Umbraco.Web.BackOffice/Install/InstallApiController.cs # version.json
2022-09-12 16:34:39 +02:00
parent 68ff7b234d d5be2fb89c
commit 74c45ee60d
221 changed files with 3864 additions and 678 deletions
--- a/templates/UmbracoProject/appsettings.json
+++ b/templates/UmbracoProject/appsettings.json
@@ -29,12 +29,10 @@
        "SanitizeTinyMce": true
      },
      "Content": {
+        "AllowEditInvariantFromNonDefault": true,
        "ContentVersionCleanupPolicy": {
          "EnableCleanup": true
        }
-      },
-      "Security": {
-        "AllowEditInvariantFromNonDefault": true
      }
    }
  }