Damian Mooyman 1d122803cc Merge remote-tracking branch 'origin/3.1' into 3.2 ... Conflicts: dev/SapphireTest.php docs/en/02_Developer_Guides/01_Templates/01_Syntax.md forms/DatetimeField.php forms/NullableField.php forms/NumericField.php forms/gridfield/GridField.php tests/control/DirectorTest.php tests/model/DataObjectSchemaGenerationTest.php tests/model/MySQLDatabaseTest.php		2015-06-19 10:48:07 +12:00
..
File.php	Merge remote-tracking branch 'origin/3.1' into 3.2	2015-06-19 10:48:07 +12:00
FileFinder.php	API Marked statics private, use Config API instead (#8317)	2013-03-24 17:20:53 +01:00
FileNameFilter.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
Filesystem.php	API New Database abstraction layer. Ticket #7429	2014-07-09 18:04:05 +12:00
Folder.php	API Revert DataObject::validate to 3.1 method signature (protected)	2015-06-16 11:59:21 +12:00
GD.php	Merge remote-tracking branch 'composer/3.1' into 3	2015-01-15 18:52:46 +13:00
ImagickBackend.php	Merge remote-tracking branch 'origin/3.1' into 3	2015-03-11 11:40:06 +13:00
Upload.php	Merge remote-tracking branch 'origin/3.1' into 3	2015-06-17 11:24:25 +12:00