mark_story d12c232d8a Merge branch '1.3' into merger ... Conflicts: app/config/core.php cake/console/templates/skel/config/core.php cake/dispatcher.php cake/libs/controller/components/auth.php cake/libs/view/helpers/form.php cake/tests/cases/libs/cake_test_case.test.php cake/tests/cases/libs/controller/components/security.test.php cake/tests/cases/libs/model/models.php cake/tests/cases/libs/router.test.php cake/tests/cases/libs/view/helpers/paginator.test.php cake/tests/lib/cake_test_case.php		2010-11-16 21:48:13 -05:00
..
config	Merge branch '1.3' into merger	2010-11-16 21:48:13 -05:00
console	Merge branch 'dispatcher-request' into 2.0	2010-11-15 22:42:54 -05:00
libs	Merge branch '1.3' into merger	2010-11-16 21:48:13 -05:00
tests	Merge branch '1.3' into merger	2010-11-16 21:48:13 -05:00
basics.php	Unwinding several ifs used in debug(). Creating simple string templates instead. Fixes #818	2010-10-24 18:23:27 -04:00
bootstrap.php	Pulling App out into its own file. Trying to stick with one class per file conventions.	2010-11-14 13:02:30 -05:00
LICENSE.txt	Fixing cakephp domain name.	2010-01-26 17:15:15 -05:00
VERSION.txt	Updating version numbers for 1.3.6	2010-11-13 20:01:20 -05:00