cakephp2-php8/lib/Cake/TestSuite/templates
Jose Lorenzo Rodriguez febf28f34b Merge remote-tracking branch 'origin/1.3' into 2.0
Conflicts:
	cake/console/templates/default/views/home.ctp
	cake/libs/controller/controller.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/view/media.test.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/test_app/views/pages/home.ctp
	lib/Cake/Cache/Engine/ApcEngine.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/View/Helper/FormHelper.php
2011-07-25 14:44:23 -04:30
..
footer.php Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
header.php Changing title CSS for web test runner. 2011-07-01 23:23:22 -04:00
menu.php Merge remote-tracking branch 'origin/1.3' into 2.0 2011-07-25 14:44:23 -04:30
missing_connection.php Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
phpunit.php Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
xdebug.php Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00