cakephp2-php8/cake/tests/test_app
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
..
config Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
controllers Merge remote branch 'origin/1.3' into 2.0 2010-05-20 12:22:04 +10:00
libs Updating test session classes to not use static methods. 2010-09-06 01:11:54 -04:00
locale Adding po files omitted from previous commit. Refs #1085 2010-09-14 21:16:57 -04:00
models Merge branch '1.3' into 2.0 2010-06-26 12:29:20 -04:00
plugins Updating test session classes to not use static methods. 2010-09-06 01:11:54 -04:00
tmp updating file engine and test case 2008-06-24 01:09:54 +00:00
vendors Update various links. Closes #392 2010-05-18 22:15:13 -03:00
views Fixing fatal error caused by missing argument. 2010-09-18 11:10:35 -04:00
webroot/theme/test_theme Adding more tests for theme assets 2009-11-27 10:27:15 -06:00