Merge branch 'patch-v7' into dev-v7

2018-04-17 15:47:41 +02:00
parent 362261e879 7d171b1e95
commit 61cd59b237
2 changed files with 24 additions and 26 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
@@ -267,11 +267,6 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
        }

        var notSupported = [
-          "Umbraco.CheckBoxList",
-          "Umbraco.DropDownMultiple",
-          "Umbraco.MacroContainer",
-          "Umbraco.RadioButtonList",
-          "Umbraco.MultipleTextstring",
          "Umbraco.Tags",
          "Umbraco.UploadField",
          "Umbraco.ImageCropper"