Merge branch 'temp8' into temp8-dirty-tracking-on-variants

2018-10-23 10:51:28 +02:00
parent 239112a1de 1badcd0b29
commit 9699e6cb71
50 changed files with 1110 additions and 981 deletions
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -238,7 +238,6 @@ namespace Umbraco.Web.Trees

            AddActionNode<ActionSort>(item, menu, true);

-            AddActionNode<ActionRollback>(item, menu);
            AddActionNode<ActionToPublish>(item, menu, convert: true);
            AddActionNode<ActionAssignDomain>(item, menu);
            AddActionNode<ActionRights>(item, menu, convert: true);