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
..
SQLAssignmentRow.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
SQLConditionalExpression.php	Merge remote-tracking branch 'origin/3.1' into 3	2015-03-31 19:54:15 +13:00
SQLConditionGroup.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
SQLDelete.php	BUG Revert some changes to ManyManyList	2014-07-23 12:38:41 +12:00
SQLExpression.php	Moved deprecation of SQLQuery to 4.0	2014-12-04 09:30:50 +13:00
SQLInsert.php	BUG Revert some changes to ManyManyList	2014-07-23 12:38:41 +12:00
SQLQuery.php	Moved deprecation of SQLQuery to 4.0	2014-12-04 09:30:50 +13:00
SQLSelect.php	Merge remote-tracking branch 'origin/3.1' into 3	2015-06-02 19:13:38 +12:00
SQLUpdate.php	BUG Revert some changes to ManyManyList	2014-07-23 12:38:41 +12:00
SQLWriteExpression.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00