José Lorenzo Rodríguez Urdaneta 4c71dd845e Merge remote branch 'origin/2.0' into 2.0-request ... Conflicts: cake/libs/controller/components/auth.php cake/tests/cases/libs/controller/components/auth.test.php		2010-07-27 22:02:08 -04:30
..
components	Merge remote branch 'origin/2.0' into 2.0-request	2010-07-27 22:02:08 -04:30
app_controller.php	Numerous 'shoer description' documentation entries updated to contain useful comments.	2010-05-30 01:20:28 +10:00
component.php	Merge remote branch 'origin/1.3' into 2.0	2010-05-20 12:22:04 +10:00
controller.php	Merge remote branch 'origin/2.0' into 2.0-request	2010-07-27 22:02:08 -04:30
pages_controller.php	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00
scaffold.php	Merge branch '2.0-phpunit' into 2.0	2010-06-28 22:31:35 -04:00