Merge branch 'v9/contrib' into v9/dev

# Conflicts: # src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
2021-11-03 13:05:43 +01:00
parent 109487f117
commit 692f952293
86 changed files with 1380 additions and 504 deletions
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -43,6 +43,7 @@
    <Content Remove="umbraco/Data/**" />
    <Content Remove="umbraco/logs/**" />
    <Content Remove="umbraco/mediacache/**" />
+    <Content Remove="umbraco\UmbracoWebsite\NotFound.cshtml" />
    <Content Remove="wwwroot/Web.config" />
  </ItemGroup>