mark_story e0aab77dab Merge branch 'master' into 2.3 ... Conflicts: app/Config/Schema/i18n.php lib/Cake/I18n/Multibyte.php lib/Cake/Test/Case/Log/CakeLogTest.php lib/Cake/Test/Case/Routing/DispatcherTest.php		2012-11-10 21:33:26 -05: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	Add App::uses()	2012-11-03 21:55:46 +05:30
Lib	enable PluginDot for routeClass parameter	2012-09-12 21:24:56 +07:00
Locale/po	Renaming more folders	2011-05-13 02:31:33 -04:30
Model	Fix STRICT warnings on PHP 5.4	2012-08-21 13:08:43 +02:00
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	Update 1.x @link in docblocks	2012-04-26 19:49:18 -07:00
webroot	Fix more coding standards issues.	2012-03-17 23:53:13 -04:00