Damian Mooyman 7ee444e08a Merge remote-tracking branch 'origin/3.1' into 3.2 ... Conflicts: admin/code/LeftAndMain.php control/injector/SilverStripeServiceConfigurationLocator.php core/ClassInfo.php filesystem/File.php model/DataObject.php model/DataQuery.php search/filters/FulltextFilter.php search/filters/SearchFilter.php tests/core/ClassInfoTest.php tests/filesystem/FileTest.php tests/model/DataListTest.php		2015-07-31 11:38:18 +12:00
..
manifest	FIX Imported namespaces now correctly used to determine class inheritance	2015-06-20 16:09:10 +01:00
startup	Merge remote-tracking branch 'origin/3.1' into 3	2015-06-02 19:13:38 +12:00
ArrayDataTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
ArrayLibTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
ClassInfoTest.php	Merge remote-tracking branch 'origin/3.1' into 3.2	2015-07-31 11:38:18 +12:00
ConfigTest.php	API Disable deprecation notices by default	2015-07-16 09:56:47 +12:00
ConvertTest.php	Merge remote-tracking branch 'origin/3.1' into 3	2015-03-31 19:54:15 +13:00
CoreTest.php	Merge remote-tracking branch 'origin/3.1' into 3	2015-02-20 10:17:19 +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	Merge remote-tracking branch 'origin/3.1'	2014-11-18 12:45:54 +13:00