silverstripe-framework/tests/core
Damian Mooyman 1d122803cc Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
	dev/SapphireTest.php
	docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
	forms/DatetimeField.php
	forms/NullableField.php
	forms/NumericField.php
	forms/gridfield/GridField.php
	tests/control/DirectorTest.php
	tests/model/DataObjectSchemaGenerationTest.php
	tests/model/MySQLDatabaseTest.php
2015-06-19 10:48:07 +12:00
..
manifest Merge remote-tracking branch 'origin/3.1' into 3.2 2015-06-19 10:48:07 +12:00
startup Merge remote-tracking branch 'origin/3.1' into 3 2015-06-02 19:13:38 +12:00
ArrayDataTest.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
ArrayLibTest.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
ClassInfoTest.php Cleaning up Test DataObjects to ensure TestOnly is implemented 2015-02-12 15:22:29 +00:00
ConfigTest.php Merge remote-tracking branch 'origin/3.1' into 3.2 2015-06-19 10:48:07 +12:00
ConvertTest.php Merge remote-tracking branch 'origin/3.1' into 3 2015-03-31 19:54:15 +13:00
CoreTest.php Merge remote-tracking branch 'origin/3.1' into 3 2015-02-20 10:17:19 +13:00
DiffTest.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
HTMLCleanerTest.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
ObjectTest.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00