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
..
ShortcodeParserTest.php	Ensure that shortcodes inside script tags are parsed. Fixes #4332.	2015-06-22 11:29:12 +01:00
SQLFormatterTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00