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
..
2016-04-26 00:17:09 +01:00
2016-03-30 13:17:28 +13:00
2016-05-05 13:38:46 +01:00
2016-03-30 13:17:28 +13:00
2016-03-30 13:17:28 +13:00
2016-03-30 13:17:28 +13:00
2016-03-30 13:17:28 +13:00
2015-03-07 12:32:04 +00:00
2015-01-22 08:40:33 +13:00
2015-01-22 08:40:33 +13:00
2016-03-30 13:17:28 +13:00
2015-01-22 08:40:33 +13:00
2015-01-22 08:40:33 +13:00
2015-01-22 08:40:33 +13:00
2015-01-15 18:56:09 +13:00
2015-02-19 13:16:40 +13:00
2015-03-19 17:46:36 +13:00
2015-03-20 19:29:20 +13:00
2015-09-15 10:58:15 +12:00
2015-09-18 14:51:04 +12:00
2015-11-16 15:16:49 +13:00
2016-02-24 15:31:12 +13:00
2016-02-29 15:10:05 +13:00
2016-05-11 11:09:20 +12:00
2016-03-30 13:17:28 +13:00
2015-11-16 16:17:10 +13:00
2016-02-24 15:33:02 +13:00
2016-02-29 15:22:39 +13:00
2016-02-24 16:30:34 +13:00
2016-02-29 15:23:25 +13:00
2015-06-18 19:40:04 +12:00