Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev

2021-04-20 19:37:24 +02:00
parent b3a9730442 99c0341692
commit 4caa4e9e1c
17 changed files with 82 additions and 117 deletions
--- a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml
+++ b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml
@@ -10,6 +10,6 @@
    }

    <text>
-        @Umbraco.RenderMacro(macroAlias, parameters)
+        @await Umbraco.RenderMacroAsync(macroAlias, parameters)
    </text>
 }