Merge branch '3'

This commit is contained in:
Daniel Hensby 2017-02-08 10:27:35 +00:00
commit 8a76a2ea8f
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E

View File

@ -2335,7 +2335,6 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
$labels['ParentID'] = _t('SiteTree.PARENTID', "Parent page");
$labels['ShowInMenus'] =_t('SiteTree.SHOWINMENUS', "Show in menus?");
$labels['ShowInSearch'] = _t('SiteTree.SHOWINSEARCH', "Show in search?");
$labels['ProvideComments'] = _t('SiteTree.ALLOWCOMMENTS', "Allow comments on this page?");
$labels['ViewerGroups'] = _t('SiteTree.VIEWERGROUPS', "Viewer Groups");
$labels['EditorGroups'] = _t('SiteTree.EDITORGROUPS', "Editor Groups");
$labels['URLSegment'] = _t('SiteTree.URLSegment', 'URL Segment', 'URL for this page');