cakephp2-php8/cake/console/templates/skel
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
..
config Merge branch '1.3' into integration 2010-10-31 21:56:59 -04:00
controllers Changing more php version strings. 2010-10-03 12:46:03 -04:00
libs Adding libs to templates/skel so baked projects contain an app/libs dir. 2009-11-17 10:27:09 -05:00
locale/eng/LC_MESSAGES Moving shell templates dirs. 2009-07-26 01:29:08 -04:00
models Moving shell templates dirs. 2009-07-26 01:29:08 -04:00
plugins Moving shell templates dirs. 2009-07-26 01:29:08 -04:00
tests Moving shell templates dirs. 2009-07-26 01:29:08 -04:00
tmp Moving shell templates dirs. 2009-07-26 01:29:08 -04:00
vendors/shells/tasks Removing vendors/img, vendors/css and vendors/js from skel dirs. 2009-11-25 22:51:33 -05:00
views Merge branch '1.3' into integration 2010-10-31 21:56:59 -04:00
webroot Added the require to dispatcher in skel to cake bake. 2010-10-30 01:29:26 -02:00
.htaccess Moving shell templates dirs. 2009-07-26 01:29:08 -04:00
app_controller.php Changing more php version strings. 2010-10-03 12:46:03 -04:00
app_helper.php Changing more php version strings. 2010-10-03 12:46:03 -04:00
app_model.php Changing more php version strings. 2010-10-03 12:46:03 -04:00
index.php Merge branch '1.3' into integration 2010-10-31 21:56:59 -04:00