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
..
code	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
lang	BUGFIX i18n module load order in i18n::include_by_locale()	2013-10-11 15:20:51 +02:00
templates	NEW Merge i18nTextCollector with existing (fixes #1838)	2013-06-02 20:17:28 +02:00
tests	BUG Fix of multiple i18nTextCollector issues: #3797, #3798, #3417	2015-07-09 10:45:08 +12:00
_config.php	ENHANCEMENT Refactored i18nTextCollector and added unit tests	2008-10-17 15:21:33 +00:00