tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-01 21:58:51 +02:00
Code Issues Projects Releases Wiki Activity
afe06661ef
silverstripe-framework/i18n
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
..
i18n.php Merge remote-tracking branch 'origin/3.0' into 3.1 2013-08-07 17:14:47 +02:00
i18nEntityProvider.php Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
i18nRailsYamlAdapter.php MINOR Fixed phpdocs 2012-06-20 23:59:16 +02:00
i18nSSLegacyAdapter.php Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
i18nTextCollector.php Fixed injector usage in i18nTextCollector 2013-06-02 23:30:33 +02:00
i18nTranslateAdapterInterface.php MINOR Fixed phpdocs 2012-06-20 23:59:16 +02:00