Merge branch '3.6' into 3.7
This commit is contained in:
commit
29bd446b8d
|
@ -12,7 +12,7 @@ SilverStripe\CMS\Controllers\ContentController:
|
||||||
SilverStripe\Core\Injector\Injector:
|
SilverStripe\Core\Injector\Injector:
|
||||||
SilverStripe\FullTextSearch\Search\Queries\SearchQuery:
|
SilverStripe\FullTextSearch\Search\Queries\SearchQuery:
|
||||||
calls:
|
calls:
|
||||||
- [ setHandler, [ %$SilverStripe\FullTextSearch\Search\Adapters\SolrSearchAdapter ]]
|
- [ setHandler, [ '%$SilverStripe\FullTextSearch\Search\Adapters\SolrSearchAdapter' ]]
|
||||||
|
|
||||||
SilverStripe\Dev\Tasks\MigrateFileTask:
|
SilverStripe\Dev\Tasks\MigrateFileTask:
|
||||||
extensions:
|
extensions:
|
||||||
|
|
Loading…
Reference in New Issue