cakephp2-php8/cake
mark_story ecf7811b7a Merge branch '2.0' into 2.0-request
Conflicts:
	cake/dispatcher.php
	cake/libs/controller/components/request_handler.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
2010-06-27 23:21:11 -04:00
..
config Updating version numbers to 1.3.2 2010-06-07 02:21:51 +10:00
console Merge branch '1.3' into 2.0 2010-06-26 12:29:20 -04:00
libs Merge branch '2.0' into 2.0-request 2010-06-27 23:21:11 -04:00
tests Merge branch '2.0' into 2.0-request 2010-06-27 23:21:11 -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-27 23:21:11 -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