1
0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
silverstripe-framework/i18n
Daniel Hensby ca8d0f2818 Merge branch '3.1' into 3.2
Conflicts:
	dev/Debug.php
	docs/en/05_Contributing/01_Code.md
	forms/FormField.php
	i18n/i18nTextCollector.php
	model/DataQuery.php
2015-07-20 10:48:01 +01:00
..
i18n.php Set deprecation level for all changes in 3.x to 4.0 2015-06-19 13:07:41 +12:00
i18nEntityProvider.php BUG Fix of multiple i18nTextCollector issues: , , 2015-07-09 10:45:08 +12:00
i18nRailsYamlAdapter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
i18nSSLegacyAdapter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
i18nTextCollector.php Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
i18nTranslateAdapterInterface.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00