silverstripe-framework/tests/i18n
Damian Mooyman 319b96b48b Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
	docs/en/05_Contributing/01_Code.md
	forms/TreeDropdownField.php
	model/DataObject.php
	security/Member.php
	tests/model/DataObjectTest.php
2015-03-11 11:40:06 +13:00
..
_fakewebroot Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
i18nSSLegacyAdapterTest.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
i18nTest.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
i18nTextCollectorTest.php Merge remote-tracking branch 'origin/3.1' into 3 2015-03-11 11:40:06 +13:00
i18nTextCollectorTestMyObject.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
i18nTextCollectorTestMySubObject.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00