Merge branch dev-v7 into temp-fsTreeController

2017-07-11 19:06:01 +02:00
parent 290f34f034 1d3279fe07
commit 87b51d1418
238 changed files with 7063 additions and 1734 deletions
--- a/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
+++ b/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
@@ -7,7 +7,7 @@ namespace Umbraco.Web.Trees
    /// <summary>
    /// Tree for displaying partial views in the settings app
    /// </summary>
-    [Tree(Constants.Applications.Settings, "partialViews", "Partial Views", sortOrder: 2)]
+    [Tree(Constants.Applications.Settings, "partialViews", null, sortOrder: 2)]
 	public class PartialViewsTreeController : FileSystemTreeController2
    {
 		protected override IFileSystem2 FileSystem