cakephp2-php8/cake/tests/cases
mark_story d1f5acd0e0 Merge commit 'origin/1.2' into 1.2-merge-in
Conflicts:
	cake/console/libs/shell.php
	cake/libs/model/connection_manager.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/javascript.php
	cake/tests/cases/libs/i18n.test.php
	cake/tests/cases/libs/model/connection_manager.test.php
	cake/tests/cases/libs/model/model_read.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/groups/database.group.php
2009-10-14 00:51:55 -04:00
..
console Merge branch '1.3-console' into 1.3 2009-10-11 21:51:02 -04:00
libs Merge commit 'origin/1.2' into 1.2-merge-in 2009-10-14 00:51:55 -04:00
basics.test.php Adding skips for cache() and clearCache() if caching is disabled. 2009-09-13 14:03:16 -04:00
dispatcher.test.php Merge branch '1.2' into 1.2-merger 2009-09-13 13:52:58 -04:00