Damian Mooyman 8331171f2c Merge remote-tracking branch 'origin/3.1' into 3 ... Conflicts: .scrutinizer.yml admin/javascript/LeftAndMain.Panel.js core/startup/ParameterConfirmationToken.php dev/Debug.php dev/FixtureBlueprint.php docs/en/00_Getting_Started/05_Coding_Conventions.md docs/en/00_Getting_Started/index.md docs/en/02_Developer_Guides/01_Templates/01_Syntax.md filesystem/File.php filesystem/Folder.php forms/FieldList.php forms/LabelField.php forms/MoneyField.php forms/TextField.php forms/TreeDropdownField.php forms/Validator.php forms/gridfield/GridField.php forms/gridfield/GridFieldExportButton.php lang/de.yml lang/fi.yml model/DataObject.php model/SQLQuery.php parsers/ShortcodeParser.php security/ChangePasswordForm.php security/Security.php tests/control/DirectorTest.php tests/core/startup/ParameterConfirmationTokenTest.php tests/dev/FixtureBlueprintTest.php tests/forms/FieldListTest.php tests/forms/MoneyFieldTest.php tests/model/SQLQueryTest.php tests/security/SecurityTest.php		2015-06-02 19:13:38 +12:00
..
File.php	Merge remote-tracking branch 'origin/3.1' into 3	2015-06-02 19:13:38 +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	Merge remote-tracking branch 'origin/3.1' into 3	2015-06-02 19:13:38 +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	FEATURE - Added maximum upload file size by type	2015-03-31 21:57:32 +10:30