cakephp2-php8/cake/config
mark_story d12c232d8a Merge branch '1.3' into merger
Conflicts:
	app/config/core.php
	cake/console/templates/skel/config/core.php
	cake/dispatcher.php
	cake/libs/controller/components/auth.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
	cake/tests/lib/cake_test_case.php
2010-11-16 21:48:13 -05:00
..
unicode/casefolding Changing more php version strings. 2010-10-03 12:46:03 -04:00
config.php Merge branch '1.3' into merger 2010-11-16 21:48:13 -05:00
paths.php Changing more php version strings. 2010-10-03 12:46:03 -04:00