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
ArrayLib.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
ClassInfo.php	Merge remote-tracking branch 'origin/3.1' into 3.2	2015-07-31 11:38:18 +12:00
Config.php	Merge branch '3.1' into 3.2	2015-07-20 10:48:01 +01:00
Constants.php	Declare the global mapping	2015-07-23 20:52:09 +02:00
Convert.php	Merge remote-tracking branch 'origin/3.1' into 3	2015-03-31 19:54:15 +13:00
Core.php	Merge remote-tracking branch 'origin/3.1' into 3	2015-03-11 11:40:06 +13:00
DAG.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
Diff.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
Extension.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
Flushable.php	NEW Provide a consistent way of triggering flush	2014-08-22 09:24:27 +12:00
HTMLCleaner.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
Object.php	Set deprecation level for all changes in 3.x to 4.0	2015-06-19 13:07:41 +12:00
PaginatedList.php	UPDATE: change all instances of $this->request to use appropriate getter/setter	2015-04-30 11:04:08 +12:00
TempPath.php	Merge remote-tracking branch 'origin/3.1' into 3	2015-02-20 10:17:19 +13:00