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
..
console	Turning __get() back into methods. There were so few properties being accessed that it didn't make sense to have __get(), over a handful of methods.	2010-11-12 23:57:55 -05:00
libs	Merge branch '1.3' into merger	2010-11-16 21:48:13 -05:00
basics.test.php	Unwinding several ifs used in debug(). Creating simple string templates instead. Fixes #818	2010-10-24 18:23:27 -04:00