silverstripe-framework/tests/i18n/_fakewebroot
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
..
assets BUG Fix of multiple i18nTextCollector issues: #3797, #3798, #3417 2015-07-09 10:45:08 +12:00
i18nnonstandardmodule BUG Fix of multiple i18nTextCollector issues: #3797, #3798, #3417 2015-07-09 10:45:08 +12:00
i18nothermodule Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
i18ntestmodule Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
notmodule BUG Fix of multiple i18nTextCollector issues: #3797, #3798, #3417 2015-07-09 10:45:08 +12:00
themes Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
_manifest_exclude BUGFIX Fixed distribution of textcollector files to modules (was collecting all entities into all modules before) - added unit tests 2008-10-17 17:44:14 +00:00