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
..
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2015-03-07 12:32:04 +00:00
2014-12-17 15:48:35 +13:00
2015-06-02 19:13:38 +12:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-18 12:11:57 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-18 12:11:57 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2015-03-07 12:32:04 +00:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2015-01-22 08:40:33 +13:00
2015-01-22 08:40:33 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:35 +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
2014-12-17 15:48:35 +13:00
2014-12-17 15:48:58 +13:00
2014-12-17 15:50:06 +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-05-28 18:59:11 +12:00
2015-05-11 12:32:00 +12:00
2014-12-17 15:48:54 +13:00