mark_story 3ea8c2246a Merge branch '1.3' into merger ... Conflicts: cake/console/cake.php cake/dispatcher.php cake/libs/controller/components/cookie.php cake/libs/view/helper.php cake/libs/view/helpers/ajax.php cake/tests/cases/dispatcher.test.php cake/tests/cases/libs/model/model_validation.test.php cake/tests/cases/libs/view/helpers/ajax.test.php cake/tests/lib/cake_test_fixture.php		2011-03-01 22:21:44 -05:00
..
auth	Making Authorize and Authenticate objects have constructors like other components.	2011-02-17 23:17:07 -05:00
acl.php	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00
auth.php	Merge branch 'clean-get' into 2.0	2011-02-21 12:47:41 -05:00
cookie.php	Merge branch '1.3' into merger	2011-03-01 22:21:44 -05:00
email.php	Merge branch '1.3' into merger	2011-03-01 22:21:44 -05:00
paginator.php	Updating documentation for paginator helper, and component.	2010-12-28 22:26:33 -05:00
request_handler.php	Merge branch '1.3' into merger	2011-01-18 20:04:30 -05:00
security.php	Merge branch '2.0-auth' into 2.0	2011-02-14 22:45:39 -05:00
session.php	Adding docs about the ability to set settings in the helper as well.	2011-02-21 14:08:29 -05:00