silverstripe-framework/docs/en
Ingo Schommer b0d3f7f3a2 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	api/RSSFeed.php
	dev/SapphireTest.php
	tests/control/RequestHandlingTest.php
2013-03-26 10:46:41 +01:00
..
_images Added docs for composer 2012-11-03 18:00:58 +13:00
changelogs Merge remote-tracking branch 'origin/3.1' 2013-03-26 10:46:41 +01:00
howto Merge remote-tracking branch 'origin/3.1' 2013-03-26 10:46:41 +01:00
installation API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
misc Merge remote-tracking branch 'origin/3.1' 2013-03-26 10:46:41 +01:00
reference API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
topics Merge remote-tracking branch 'origin/3.1' 2013-03-26 10:46:41 +01:00
tutorials API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
index.md Corrected a number of inbound links pointing to the documentation. 2012-10-09 14:53:47 +13:00