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
..
config	Merge branch '1.3' into 2.0	2010-06-26 12:29:20 -04:00
controllers/components	Adding empty file to all empty directories	2007-05-06 03:09:27 +00:00
libs	Adding app/libs dir. app/libs is for storing 1st party libraries that are not technically vendor files, as they do not originate from vendor sources.	2009-10-28 09:16:09 -04:00
locale/eng/LC_MESSAGES	Adding empty file to all empty directories	2007-05-06 03:09:27 +00:00
models	Adding empty file to all empty directories	2007-05-06 03:09:27 +00:00
plugins	Adding empty file to all empty directories	2007-05-06 03:09:27 +00:00
tests	Adding empty file to all empty directories	2007-05-06 03:09:27 +00:00
tmp	Re-adding file delete by error	2010-02-27 23:38:46 -04:30
vendors/shells	Removing unused folders from app/vendors	2007-10-18 16:51:16 +00:00
views	Merge branch '1.3' into 1.3-misc	2009-11-06 09:25:11 -05:00
webroot	Numerous "Enter description here" block comments updated to have meaningful descriptions.	2010-05-30 01:10:48 +10:00
.htaccess	Merging fixes and enhancements into trunk	2006-02-18 23:42:21 +00:00
index.php	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00