Merge branch '3.6' into 4.0

This commit is contained in:
Daniel Hensby 2018-03-18 09:17:20 +00:00
commit 00fea26be9
No known key found for this signature in database
GPG Key ID: D8DEBC4C8E7BC8B9

View File

@ -17,7 +17,6 @@ class ContentControllerSearchExtension extends Extension
{
private static $allowed_actions = array(
'SearchForm',
'results',
);
/**