tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-06 01:31:22 +02:00
Code Issues Projects Releases Wiki Activity
c396645aed
silverstripe-framework/tests/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
..
_fakewebroot NEW Merge i18nTextCollector with existing (fixes #1838) 2013-06-02 20:17:28 +02:00
i18nSSLegacyAdapterTest.php API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
i18nTest.php Merge remote-tracking branch 'origin/3.0' into 3.1 2013-08-07 17:14:47 +02:00
i18nTextCollectorTest.php NEW Merge i18nTextCollector with existing (fixes #1838) 2013-06-02 20:17:28 +02:00
i18nTextCollectorTestMyObject.php API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
i18nTextCollectorTestMySubObject.php API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00