Ingo Schommer 4af9143d3b Merge remote-tracking branch 'origin/3.1' ... Conflicts: docs/en/misc/contributing/code.md		2014-02-07 16:43:22 +13:00
..
i18n.php	BUG Default Member.Locale now chooses a better default value when i18n.locale is not a valid translation	2014-01-30 15:55:14 +13: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	Updating @package and @subpackage doc tags	2013-11-29 17:49:30 +13:00
i18nTextCollector.php	Merge remote-tracking branch 'origin/3.1'	2014-02-04 08:19:04 +13:00
i18nTranslateAdapterInterface.php	MINOR Fixed phpdocs	2012-06-20 23:59:16 +02:00