Merge branch '4.0' into 4.1

2018-03-18 09:17:51 +00:00 · 2018-03-18 09:17:51 +00:00 · 7dea009ad8
parent 9bf05b397f 00fea26be9
commit 7dea009ad8
1 changed files with 0 additions and 1 deletions
--- a/code/Search/ContentControllerSearchExtension.php
+++ b/code/Search/ContentControllerSearchExtension.php
@ -17,7 +17,6 @@ class ContentControllerSearchExtension extends Extension
 {
    private static $allowed_actions = array(
        'SearchForm',
-        'results',
    );

    /**