Merge pull request #11570 from umbraco/v9/feature/merge_v9_contrib_03-11-2021

V9: Merge `v9/contrib` 03-11-2021
2021-11-03 14:54:59 +01:00
parent be65f12ed7 67604654c1
commit 7f061bd818
83 changed files with 1389 additions and 499 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>