silverstripe-framework/docs/en
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
..
_images API New and renamed image functions 2015-06-12 17:02:55 -07:00
00_Getting_Started Merge remote-tracking branch 'origin/3.1' into 3 2015-06-17 11:24:25 +12:00
01_Tutorials Merge remote-tracking branch 'origin/3.1' into 3 2015-06-17 11:24:25 +12:00
02_Developer_Guides Merge remote-tracking branch 'origin/3.1' into 3.2 2015-06-19 10:48:07 +12:00
03_Upgrading Model guide documentation 2014-12-17 15:49:24 +13:00
04_Changelogs Merge remote-tracking branch 'origin/3.1' into 3.2 2015-06-19 10:48:07 +12:00
05_Contributing Merge remote-tracking branch 'origin/3.1' into 3.2 2015-06-19 10:48:07 +12:00
changelogs Migrate 3.2 docs into new docs structure 2014-12-17 15:50:06 +13:00
index.md add new lessons 9, 10 2015-02-13 00:48:05 +13:00