Damian Mooyman 574bc6038b Merge 3 into master ... # Conflicts: # CONTRIBUTING.md # admin/css/screen.css # admin/css/screen.css.map # admin/javascript/LeftAndMain.EditForm.js # admin/javascript/LeftAndMain.js # admin/scss/_forms.scss # dev/Debug.php # docs/en/05_Contributing/01_Code.md # forms/DropdownField.php # model/DataObject.php # model/Versioned.php # model/fieldtypes/DBLocale.php # tests/forms/gridfield/GridFieldExportButtonTest.yml # tests/model/MoneyTest.php # tests/model/MoneyTest.yml # tests/model/SQLQueryTest.php		2016-05-18 18:36:10 +12:00
..
manifest	Merge branch '3'	2016-05-04 23:36:10 +01:00
startup	Merge 3 into master	2016-05-18 18:36:10 +12:00
ArrayDataTest.php	API: Move DBField subclasses into SilverStripe\Model\FieldType namespace	2016-03-22 18:09:30 +13:00
ArrayLibTest.php	Do not hang on nested parameters in search context	2015-09-23 09:12:02 +02:00
ClassInfoTest.php	BUG Ensure that filters on any fixed field are scoped to the base data table	2015-10-30 16:26:14 +13:00
ConfigTest.php	MINOR: Avoid access-changing subclass in test.	2016-03-22 17:39:09 +13:00
ConvertTest.php	Replaced obsolete mime types	2016-01-24 18:15:47 +13:00
CoreTest.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
DiffTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
HTMLCleanerTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
ObjectTest.php	API Extensible::invokeWithExtension has same method signature as Extensible::extend	2016-02-25 17:32:41 +13:00