tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-09 03:01:18 +02:00
Code Issues Projects Releases Wiki Activity
afe06661ef
silverstripe-framework/docs/en/misc/contributing
History
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
..
code.md Docs: Note about branch merging 2013-06-25 10:35:30 +02:00
documentation.md Updated github path 2013-05-17 00:45:52 +02:00
index.md Update module development, remove outdated release steps 2013-06-15 12:06:25 +12:00
issues.md Updated github path 2013-05-17 00:45:52 +02:00
translation.md Translations: Switch to Transifex format 2013-08-07 00:25:16 +02:00