Mark Story 08e7bcb7ab Merge branch '1.3' into integration ... Conflicts: app/config/core.php cake/console/libs/acl.php cake/console/templates/skel/config/core.php cake/console/templates/skel/webroot/test.php cake/dispatcher.php cake/libs/view/errors/missing_action.ctp cake/libs/view/helpers/form.php cake/tests/cases/libs/cache/memcache.test.php cake/tests/cases/libs/controller/controller.test.php cake/tests/cases/libs/log/file_log.test.php cake/tests/cases/libs/model/cake_schema.test.php cake/tests/cases/libs/router.test.php cake/tests/cases/libs/view/helpers/ajax.test.php cake/tests/groups/bake.group.php cake/tests/groups/behaviors.group.php cake/tests/groups/i18n.group.php cake/tests/groups/javascript.group.php cake/tests/lib/reporter/cake_cli_reporter.php		2010-10-31 21:56:59 -04:00
..
config	Merge branch '1.3' into integration	2010-10-31 21:56:59 -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	Changing more php version strings.	2010-10-03 12:46:03 -04:00
.htaccess	Merging fixes and enhancements into trunk	2006-02-18 23:42:21 +00:00
index.php	Changing more php version strings.	2010-10-03 12:46:03 -04:00