Merge branch 'dev-v7.7' into temp-U4-9984

2017-06-26 18:01:57 +01:00
parent 07356db30e 754dbc9621
commit 3083f185d0
213 changed files with 5746 additions and 1559 deletions
--- a/src/Umbraco.Web/WebBootManager.cs
+++ b/src/Umbraco.Web/WebBootManager.cs
@@ -227,10 +227,12 @@ namespace Umbraco.Web

            //Now ensure webapi is initialized after everything
            GlobalConfiguration.Configuration.EnsureInitialized();
-
+            
            return this;
        }

+        
+
        internal static void ConfigureGlobalFilters()
        {
            GlobalFilters.Filters.Add(new EnsurePartialViewMacroViewContextFilterAttribute());