cakephp2-php8/cake/console/templates/skel
predominant 6a18b2bc1d Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/basics.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/libs/controller/components/request_handler.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/sanitize.php
	cake/libs/validation.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
2010-05-20 12:22:04 +10:00
..
config Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
controllers Removing closing PHP tags. 2010-05-11 08:27:28 +10: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 Change Cake Console files to new use of shortcut for translations. 2010-04-16 01:43:39 +10:00
webroot Merge remote branch 'origin/1.3' into 2.0 2010-05-20 12:22:04 +10:00
.htaccess Moving shell templates dirs. 2009-07-26 01:29:08 -04:00
app_controller.php Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
app_helper.php Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
app_model.php Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
index.php Removing closing PHP tags. 2010-05-11 08:27:28 +10:00