silverstripe-framework/docs/en/02_Developer_Guides/05_Extending
Damian Mooyman 1e1a7a345c Merge remote-tracking branch 'origin/3'
Conflicts:
	control/Director.php
	filesystem/File.php
	filesystem/GD.php
	filesystem/ImagickBackend.php
	forms/HtmlEditorField.php
	javascript/UploadField_uploadtemplate.js
	model/Image.php
	model/Image_Backend.php
	model/fieldtypes/Enum.php
	templates/AssetUploadField.ss
	tests/model/ImageTest.php
	tests/search/FulltextFilterTest.php
2015-11-03 14:23:16 +13:00
..
How_Tos Revert #3425 #3396 to restore deprecated functionality 2015-08-24 11:26:25 +12:00
00_Modules.md DOCS Module standard 1.0 2015-10-19 11:44:31 +13:00
01_Extensions.md Merge remote-tracking branch 'origin/3' 2015-11-03 14:23:16 +13:00
04_Shortcodes.md fixed typo in shortcode docs 2015-09-03 14:46:42 +02:00
05_Injector.md Merge branch '3' 2015-08-17 13:12:41 +01:00
06_Aspects.md Review and clean up of extending section 2014-12-17 15:49:08 +13:00
07_Templates.md Review and clean up of extending section 2014-12-17 15:49:08 +13:00
index.md Review and clean up of extending section 2014-12-17 15:49:08 +13:00