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
..
en	Merge 3 into master	2016-05-18 18:36:10 +12:00
_manifest_exclude	ENHANCEMENT Added sapphire/docs (migrated from https://github.com/chillu/silverstripe-doc-restructuring)	2011-02-07 19:55:13 +13:00
LICENSE	ENHANCEMENT Added sapphire/docs (migrated from https://github.com/chillu/silverstripe-doc-restructuring)	2011-02-07 19:55:13 +13:00