silverstripe-framework/docs/en
Damian Mooyman 7ee444e08a Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
	admin/code/LeftAndMain.php
	control/injector/SilverStripeServiceConfigurationLocator.php
	core/ClassInfo.php
	filesystem/File.php
	model/DataObject.php
	model/DataQuery.php
	search/filters/FulltextFilter.php
	search/filters/SearchFilter.php
	tests/core/ClassInfoTest.php
	tests/filesystem/FileTest.php
	tests/model/DataListTest.php
2015-07-31 11:38:18 +12:00
..
_images API New and renamed image functions 2015-06-12 17:02:55 -07:00
00_Getting_Started Merge pull request #4403 from tractorcow/pulls/3.2/disable-deprecation 2015-07-23 14:23:41 +01:00
01_Tutorials Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
02_Developer_Guides Merge remote-tracking branch 'origin/3.1' into 3.2 2015-07-31 11:38:18 +12:00
03_Upgrading DOCS: fixed broken link 2015-06-23 11:57:54 +12:00
04_Changelogs API Disable deprecation notices by default 2015-07-16 09:56:47 +12:00
05_Contributing Merge remote-tracking branch 'origin/3.1' into 3.2 2015-07-31 11:38:18 +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