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
..
2009-05-24 12:16:17 +00:00
2014-08-19 09:17:15 +12:00
2014-08-19 09:17:15 +12:00
2010-02-22 04:37:32 +00:00
2015-02-12 15:22:29 +00:00
2014-08-19 09:17:15 +12:00
2014-08-19 09:17:15 +12:00
2015-02-20 10:17:19 +13:00
2012-04-15 10:50:19 +12:00
2014-08-19 09:17:15 +12:00
2011-04-26 11:01:38 +10:00
2015-05-04 22:50:33 +01:00
2014-08-19 09:17:15 +12:00
2015-03-13 09:27:23 +00:00
2014-08-19 09:17:15 +12:00
2014-08-19 09:17:15 +12:00
2015-03-13 16:16:16 +00:00
2015-03-13 09:27:23 +00:00
2015-03-11 11:40:06 +13:00
2014-05-06 12:22:46 +12:00
2014-08-25 10:04:24 +12:00
2014-08-25 10:04:24 +12:00
2014-12-04 09:30:50 +13:00
2011-03-29 18:07:58 +13:00
2014-08-19 09:17:15 +12:00
2014-08-19 09:17:15 +12:00
2014-08-19 09:17:15 +12:00
2014-08-19 09:17:15 +12:00
2011-03-31 09:56:21 +13:00
2014-08-19 09:17:15 +12:00
2014-08-19 09:17:15 +12:00
2015-02-12 15:22:29 +00:00
2014-08-19 09:17:15 +12:00
2013-04-09 10:24:18 +12:00
2014-08-19 09:17:15 +12:00
2014-11-19 11:05:07 +13:00
2013-04-06 15:56:27 +02:00
2014-08-19 09:17:15 +12:00
2012-09-20 10:46:59 +02:00
2014-08-19 09:17:15 +12:00
2014-08-19 09:17:15 +12:00
2014-08-19 09:17:15 +12:00
2013-04-22 11:50:57 +12:00
2015-05-08 13:23:53 +12:00
2015-05-08 13:23:53 +12:00
2015-03-05 12:07:14 +13:00
2014-08-19 09:17:15 +12:00
2015-02-12 15:22:29 +00:00
2014-08-19 09:17:15 +12:00
2015-06-02 19:13:38 +12:00
2012-12-21 15:20:59 +01:00
2014-08-19 09:17:15 +12:00
2014-07-09 18:04:05 +12:00
2014-08-19 09:17:15 +12:00
2015-03-05 23:12:02 +00:00
2014-08-19 09:17:15 +12:00
2014-11-18 12:45:54 +13:00
2012-11-28 09:37:08 +13:00
2014-08-19 09:17:15 +12:00
2014-08-19 09:17:15 +12:00
2015-02-08 18:42:36 +13:00
2011-03-29 18:07:58 +13:00
2013-12-16 03:29:29 +00:00