cakephp2-php8/lib/Cake/Model/Behavior
Jose Lorenzo Rodriguez 7c5352a6c2 Merge branch 'master' into 2.0
Conflicts:
	cake/libs/controller/components/request_handler.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/view.php
	cake/tests/cases/libs/view/view.test.php
	lib/Cake/Cache/Engine/FileEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Console/cake
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/VERSION.txt
2011-10-16 17:56:22 -04:30
..
AclBehavior.php Keeping BC on short syntax for Acl and Tree behavior. 2011-10-16 12:06:41 +02:00
ContainableBehavior.php Dropping short syntax support for Behavior configuration. 2011-10-15 20:52:41 +02:00
TranslateBehavior.php Merge branch 'master' into 2.0 2011-10-16 17:56:22 -04:30
TreeBehavior.php Keeping BC on short syntax for Acl and Tree behavior. 2011-10-16 12:06:41 +02:00