Merge branch 'dev-v7.7' into temp-isearchabletree

# Conflicts: # src/Umbraco.Web.UI/umbraco/config/lang/en.xml # src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml # src/Umbraco.Web/Trees/ContentTreeController.cs
2017-07-20 22:21:59 +10:00
parent 618c50f9da 6f74fcf24a
commit 525254efd4
1505 changed files with 11362 additions and 60852 deletions
--- a/src/Umbraco.Web/WebBootManager.cs
+++ b/src/Umbraco.Web/WebBootManager.cs
@@ -228,10 +228,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());