Merge branch 'v8/8.5' into v8/dev

# Conflicts: # src/SolutionInfo.cs
2020-01-03 11:59:05 +00:00
parent 48a51ea4ef 97f48ed569
commit ad53b76308
100 changed files with 2125 additions and 3146 deletions
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -55,8 +55,8 @@
        });

        function setCurrentNode(node) {
-            vm.currentNode = node;
            updateModel();
+            vm.currentNode = node;
        }
        
        var copyAllEntries = function() {