Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-namespaces

# Conflicts: # src/Umbraco.Web/Mvc/SurfaceController.cs
2021-02-12 08:40:36 +01:00
parent dda023c174 aeae2fcfd2
commit 9dcd4cb74a
7 changed files with 0 additions and 202 deletions
--- a/src/Umbraco.Web.Website/Controllers/SurfaceController.cs
+++ b/src/Umbraco.Web.Website/Controllers/SurfaceController.cs
@@ -17,9 +17,6 @@ namespace Umbraco.Cms.Web.Website.Controllers
    /// <summary>
    /// Provides a base class for front-end add-in controllers.
    /// </summary>
-    // TODO: Migrate MergeModelStateToChildAction and MergeParentContextViewData action filters
-    // [MergeModelStateToChildAction]
-    // [MergeParentContextViewData]
    [AutoValidateAntiforgeryToken]
    public abstract class SurfaceController : PluginController
    {