silverstripe-framework/i18n
Mateusz Uzdowski 8bf3853887 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	docs/en/misc/contributing/issues.md
	docs/en/reference/uploadfield.md
	forms/HtmlEditorField.php
	i18n/i18n.php
	javascript/HtmlEditorField.js
	model/DB.php
	model/Image.php
	model/SQLQuery.php
2014-08-14 09:08:26 +12:00
..
i18n.php Merge remote-tracking branch 'origin/3.1' 2014-08-14 09:08:26 +12: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