predominant 015872445b Merge remote branch 'origin/1.3' into 2.0 ... Conflicts: cake/console/libs/acl.php cake/tests/cases/libs/view/helpers/form.test.php cake/tests/cases/libs/view/helpers/javascript.test.php		2010-04-23 12:52:56 +10:00
..
schema	Changed all public 'var' declarations to be 'public $var'	2010-04-04 17:14:00 +10:00
acl.ini.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
bootstrap.php	Fix missing quotation mark.	2010-04-19 12:08:04 +10:00
core.php	Removing other uses of Routing.admin as it has been removed from Router.	2010-04-20 23:43:51 -04:00
database.php.default	Changed all public 'var' declarations to be 'public $var'	2010-04-04 17:14:00 +10:00
routes.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00