cakephp2-php8/cake/libs/controller/components
predominant 92215e1795 Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/libs/inflector.php
	cake/libs/view/helpers/text.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/view/helpers/time.test.php
2010-04-16 23:43:28 +10:00
..
acl.php Convert controllers and sockets to new formate for shorthand translation functions. 2010-04-16 01:52:49 +10: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 Convert controllers and sockets to new formate for shorthand translation functions. 2010-04-16 01:52:49 +10: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