mark_story 2020675078 Merge branch '1.3' into 2.0 ... Conflicts: cake/dispatcher.php cake/tests/cases/libs/controller/components/request_handler.test.php		2010-06-30 22:47:27 -04:00
..
console	Merge branch '2.0-phpunit' into 2.0	2010-06-28 22:31:35 -04:00
libs	Merge branch '1.3' into 2.0	2010-06-30 22:47:27 -04:00
basics.test.php	Fixing basics.php test for phpunit.	2010-06-09 17:07:36 -04:00
dispatcher.test.php	Migrating DispatcherTest to PHPUnit, alos removing class dependencies from test folder home.ctp file	2010-06-08 23:58:01 -04:30