cakephp2-php8/cake/console/libs/tasks
mark_story f21161ef46 Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0
differences upon merging.

Conflicts:
	app/config/core.php
	cake/console/templates/skel/config/core.php
	cake/libs/cache/file.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/i18n.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/model/model_write.test.php
2010-09-24 23:27:22 -04:00
..
bake.php Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
controller.php Merge branch '1.3' into 2.0 2010-09-06 16:53:04 -04:00
db_config.php Updating DbConfigTask to PHPUnit. 2010-06-08 22:14:48 -04:00
extract.php Merge branch '2.0-phpunit' into 2.0 2010-06-28 22:31:35 -04:00
fixture.php Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
model.php Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
plugin.php Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
project.php Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
template.php Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0 2010-09-24 23:27:22 -04:00
test.php Merge remote branch 'origin/1.3' into 2.0 2010-05-20 12:22:04 +10:00
view.php Merge branch '1.3' into 2.0 2010-09-06 16:53:04 -04:00