cakephp2-php8/cake/tests/cases/libs/model/behaviors
predominant e4d292bfa4 Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/console/libs/shell.php
	cake/libs/controller/components/acl.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/security.php
	cake/libs/controller/components/session.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/number.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/text.php
	cake/libs/view/helpers/time.php
	cake/libs/view/helpers/xml.php
2010-04-06 12:19:34 +10:00
..
acl.test.php Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00
containable.test.php Merge remote branch 'origin/1.3' into 2.0 2010-04-06 12:19:34 +10:00
translate.test.php Changed all public 'var' declarations to be 'public $var' 2010-04-04 17:14:00 +10:00
tree.test.php Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00