mark_story 571c8bc08c Merge branch 'master' into 2.3 ... Conflicts: lib/Cake/Console/Command/Task/TestTask.php		2012-09-01 13:51:40 +01:00
..
Config	Add plugin support to IniReader, and harden tests.	2012-08-27 10:04:26 -03:00
Console	Update 1.x @link in docblocks	2012-04-26 19:49:18 -07:00
Controller	Helpers in custom CakeErrorController are lost	2012-06-01 15:28:06 +07:00
Error	Helpers in custom CakeErrorController are lost	2012-06-01 15:28:06 +07:00
Lib	new base class Log/Engine/BaseLog	2012-05-11 12:37:00 +07:00
Locale	Implemented translation of validation rule arguments in validation error messages. Closes #2816	2012-04-22 23:25:07 +05:30
Model	Fix STRICT warnings on PHP 5.4	2012-08-21 13:08:43 +02:00
Plugin	Add plugin support to IniReader, and harden tests.	2012-08-27 10:04:26 -03:00
tmp	Starting unification of casing in remaining folders	2011-05-13 01:53:49 -04:30
Utility	adding tests for engine overrides	2012-02-14 23:28:57 +07:00
Vendor	Update 1.x @link in docblocks	2012-04-26 19:49:18 -07:00
View	Merge branch 'master' into 2.3	2012-09-01 13:51:40 +01:00
webroot	Moving binary data to external file, it was causing failures on other tests.	2011-10-15 18:51:48 +02:00