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
..
css	Fixing name of cake icon on skel. Fixes #600	2010-04-18 22:19:17 -04:00
img	Adding cake.icon.png to the skel dir. Fixes the wrong asset being included when new projects are generated. Fixes. #637	2010-04-27 23:19:55 -04:00
js	Removing webroot/js/vendors.php. These files are no longer needed as Dispatcher can handle serving js files from vendors directories. Adding empty files to empty directories. Refs #50	2009-09-13 23:32:27 -04:00
.htaccess	Moving shell templates dirs.	2009-07-26 01:29:08 -04:00
css.php	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00
favicon.ico	Moving shell templates dirs.	2009-07-26 01:29:08 -04:00
index.php	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00
test.php	Merge remote branch 'origin/1.3' into 2.0	2010-05-20 12:22:04 +10:00