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	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
files	Adding empty files to directories that were previously omitted.	2009-09-20 18:03:42 -04:00
img	Updating CSS file and making a nicer cake icon.	2009-12-28 23:13:04 -05:00
js	Fixing cakephp domain name.	2010-01-26 17:15:15 -05:00
.htaccess	Merging fixes and enhancements into trunk	2006-01-20 07:46:14 +00:00
css.php	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00
favicon.ico	updating images/icons with optimized versions. thanks mjc	2008-06-02 04:30:14 +00:00
index.php	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00
test.php	Update various links. Closes #392	2010-05-18 22:15:13 -03:00