Ingo Schommer ba57d42349 Merge remote-tracking branch 'origin/3.0' into 3.1.0 ...

Conflicts:
	code/controllers/ContentController.php
	code/model/SiteTree.php
	tests/search/SearchFormTest.php

2013-08-20 20:59:44 +02:00

..

CMSMainSearchFormTest.php

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:21:04 +01:00

SearchFormTest.php

Merge remote-tracking branch 'origin/3.0' into 3.1.0

2013-08-20 20:59:44 +02:00

SearchFormTest.yml

ENHANCEMENT Testing new File.ShowInSearch flag, and adding it to AssetTableField view

2011-09-15 15:59:18 +02:00