cakephp2-php8/cake/libs/controller/components
Mark Story adf604a966 Merge branch '1.3' into 2.0
Conflicts:
	cake/console/templates/default/actions/controller_actions.ctp
	cake/console/templates/default/views/form.ctp
	cake/console/templates/default/views/index.ctp
	cake/console/templates/default/views/view.ctp
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
2010-05-02 17:53:42 -04:00
..
acl.php Changing AclBase into AclInterface as it is now an interface. 2010-04-23 23:52:36 -04:00
auth.php Merge remote branch 'origin/1.3' into 2.0 2010-04-16 23:43:28 +10:00
cookie.php Merge remote branch 'origin/1.3' into 2.0 2010-04-06 12:19:34 +10:00
email.php Merge branch '1.3' into 2.0 2010-05-02 17:53:42 -04:00
request_handler.php Merge remote branch 'origin/1.3' into 2.0 2010-04-06 12:19:34 +10:00
security.php Convert controllers and sockets to new formate for shorthand translation functions. 2010-04-16 01:52:49 +10:00
session.php Merge remote branch 'origin/1.3' into 2.0 2010-04-06 12:19:34 +10:00