Merge branch '4.10' into 4
This commit is contained in:
commit
6ab92e8f74
|
@ -2172,7 +2172,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
|
|||
);
|
||||
|
||||
$parentType->addExtraClass('noborder');
|
||||
$visibility->setTitle($this->fieldLabel('Visibility'));
|
||||
$visibility->setName('Visibility')->setTitle($this->fieldLabel('Visibility'));
|
||||
|
||||
|
||||
// This filter ensures that the ParentID dropdown selection does not show this node,
|
||||
|
|
|
@ -82,6 +82,7 @@
|
|||
}
|
||||
},
|
||||
"resolutions": {
|
||||
"colors": "1.1.2",
|
||||
"eslint": "^4.6.1"
|
||||
},
|
||||
"babel": {
|
||||
|
|
Loading…
Reference in New Issue