Damian Mooyman 574bc6038b Merge 3 into master ... # Conflicts: # CONTRIBUTING.md # admin/css/screen.css # admin/css/screen.css.map # admin/javascript/LeftAndMain.EditForm.js # admin/javascript/LeftAndMain.js # admin/scss/_forms.scss # dev/Debug.php # docs/en/05_Contributing/01_Code.md # forms/DropdownField.php # model/DataObject.php # model/Versioned.php # model/fieldtypes/DBLocale.php # tests/forms/gridfield/GridFieldExportButtonTest.yml # tests/model/MoneyTest.php # tests/model/MoneyTest.yml # tests/model/SQLQueryTest.php		2016-05-18 18:36:10 +12:00
..
SQLAssignmentRow.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
SQLConditionalExpression.php	BUG Fix filtersOnId ignoring WHERE "ID" IN () (#5546)	2016-05-17 18:30:33 +12: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	Set deprecation level for all changes in 3.x to 4.0	2015-06-19 13:07:41 +12:00
SQLInsert.php	BUG Revert some changes to ManyManyList	2014-07-23 12:38:41 +12:00
SQLSelect.php	Merge 3 into master	2016-05-11 15:19:35 +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