cakephp2-php8/cake
mark_story 7c0cda7ce5 Merge branch '2.0' into 2.0-request
Conflicts:
	cake/libs/router.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
2010-06-28 23:41:48 -04:00
..
config Updating version numbers to 1.3.2 2010-06-07 02:21:51 +10:00
console Merge branch '2.0-phpunit' into 2.0 2010-06-28 22:31:35 -04:00
libs Merge branch '2.0' into 2.0-request 2010-06-28 23:41:48 -04:00
tests Merge branch '2.0' into 2.0-request 2010-06-28 23:41:48 -04:00
basics.php Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
bootstrap.php Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
dispatcher.php Merge branch '2.0' into 2.0-request 2010-06-28 23:41:48 -04:00
LICENSE.txt Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
VERSION.txt Updating version numbers to 1.3.2 2010-06-07 02:21:51 +10:00