silverstripe-framework/i18n
Ingo Schommer 8ec3641e60 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	admin/javascript/LeftAndMain.FieldHelp.js
	lang/en.yml
	model/URLSegmentFilter.php
2012-12-21 15:04:17 +01:00
..
i18n.php Merge remote-tracking branch 'origin/3.0' into 3.1 2012-12-21 15:04:17 +01: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 Allow recursive includes in i18nTextCollector (fixes #8133) 2012-12-20 12:46:57 +01:00
i18nTranslateAdapterInterface.php MINOR Fixed phpdocs 2012-06-20 23:59:16 +02:00