Merge branch '4.2' into 4

This commit is contained in:
Robbie Averill 2018-09-12 14:12:15 +02:00
commit c75c629eb1

View File

@ -10,3 +10,9 @@ Name: cmsmodals
SilverStripe\Admin\ModalController: SilverStripe\Admin\ModalController:
extensions: extensions:
- SilverStripe\CMS\Forms\InternalLinkModalExtension - SilverStripe\CMS\Forms\InternalLinkModalExtension
---
Name: cmshierarchy
---
SilverStripe\ORM\Hierarchy\Hierarchy:
node_threshold_total: 50
node_threshold_leaf: 250