cakephp2-php8/cake/console/templates/skel/views/layouts
Mark Story 08e7bcb7ab Merge branch '1.3' into integration
Conflicts:
	app/config/core.php
	cake/console/libs/acl.php
	cake/console/templates/skel/config/core.php
	cake/console/templates/skel/webroot/test.php
	cake/dispatcher.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/log/file_log.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/lib/reporter/cake_cli_reporter.php
2010-10-31 21:56:59 -04:00
..
email Merge branch '1.3' into integration 2010-10-31 21:56:59 -04:00
js Moving shell templates dirs. 2009-07-26 01:29:08 -04:00
rss Moving shell templates dirs. 2009-07-26 01:29:08 -04:00
xml Removing use of e() from core and test suite. 2009-08-27 22:51:10 -04:00
ajax.ctp Merge branch '1.3' into integration 2010-10-31 21:56:59 -04:00
default.ctp Merge branch '1.3' into integration 2010-10-31 21:56:59 -04:00
flash.ctp Changing more php version strings. 2010-10-03 12:46:03 -04:00