mark_story 929bb5769e Merge branch '1.3' into 2.0 ... Conflicts: app/webroot/index.php cake/console/templates/skel/webroot/index.php cake/libs/cake_session.php cake/libs/controller/components/email.php cake/libs/controller/scaffold.php cake/libs/model/datasources/dbo/dbo_oracle.php cake/libs/model/model_behavior.php cake/libs/view/pages/home.ctp cake/tests/cases/libs/controller/components/acl.test.php cake/tests/cases/libs/file.test.php		2010-06-26 12:29:20 -04: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	Numerous 'shoer description' documentation entries updated to contain useful comments.	2010-05-30 01:20:28 +10:00
favicon.ico	Moving shell templates dirs.	2009-07-26 01:29:08 -04:00
index.php	Removing request time output from index.php. Makes non sgml requests like json easier to do. Fixes #720	2010-05-20 23:13:45 -04:00
test.php	Merge remote branch 'origin/1.3' into 2.0	2010-05-20 12:22:04 +10:00