cakephp2-php8/cake
mark_story fc79dc6232 Merge branch '2.0' into 2.0-phpunit
Conflicts:
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/lib/code_coverage_manager.php
2010-05-30 22:13:09 -04:00
..
config Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
console Merge branch '2.0' into 2.0-phpunit 2010-05-30 22:13:09 -04:00
libs Merge branch '2.0' into 2.0-phpunit 2010-05-30 22:13:09 -04:00
tests Merge branch '2.0' into 2.0-phpunit 2010-05-30 22:13:09 -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 Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
LICENSE.txt Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
VERSION.txt Updated vesion numbers to 1.3.0 2010-04-25 14:27:29 +10:00