silverstripe-framework/docs/en/misc
Ingo Schommer afe06661ef Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	admin/templates/Includes/LeftAndMain_Menu.ss
	admin/templates/Includes/ModelAdmin_ImportSpec.ss
	admin/templates/Includes/ModelAdmin_Tools.ss
	admin/templates/LeftAndMain.ss
	admin/templates/ModelSidebar.ss
	i18n/i18n.php
	templates/ComplexTableField.ss
	templates/ComplexTableField_popup.ss
	templates/FileIFrameField_iframe.ss
	templates/Includes/GridFieldItemEditView.ss
	templates/Includes/TableListField_PageControls.ss
	templates/RelationComplexTableField.ss
	templates/TableField.ss
	templates/TableListField.ss
2013-08-07 17:14:47 +02:00
..
contributing Merge remote-tracking branch 'origin/3.0' into 3.1 2013-08-07 17:14:47 +02:00
coding-conventions.md Consistently used dollar notation in template docs (see #1794) 2013-04-26 11:48:59 +02:00
index.md Update module development, remove outdated release steps 2013-06-15 12:06:25 +12:00
release-process.md Update module development, remove outdated release steps 2013-06-15 12:06:25 +12:00
ss-markdown.md Fixed sapphiredocs references 2012-11-06 11:01:48 +01:00
translation-process.md Translations: Switch to Transifex format 2013-08-07 00:25:16 +02:00