mark_story efbeab6199 Merge branch '1.3' into merger ... Conflicts: cake/libs/controller/components/email.php cake/tests/cases/console/libs/tasks/fixture.test.php lib/Cake/Console/Command/Task/DbConfigTask.php		2011-09-03 00:48:09 +01:00
..
Schema	Updating the copyright to 2011.	2011-05-30 22:32:43 -04:00
acl.ini.php	Merge branch '1.3' into merger	2011-06-23 12:48:06 -07:00
bootstrap.php	Adding better help and documentation for loading plugins. The exception renderer will serve a helpful page if a plugin is missing	2011-07-07 02:34:22 -04:30
core.php	Merge branch '1.3' into merger	2011-09-03 00:48:09 +01:00
database.php.default	Merge branch '1.3' into merger	2011-08-14 14:39:49 -04:00
email.php.default	Fixed the default name of email transport. Fixes #1728.	2011-05-24 01:01:58 -04:00
routes.php	Moving plugin route loading to app/Config/routes.php	2011-07-22 20:29:45 -04:00