cakephp2-php8/lib/Cake/Controller/Component/Acl
Jose Lorenzo Rodriguez d5c9d97dc1 Merge remote-tracking branch 'origin/master' into 2.3
Conflicts:
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Utility/CakeTime.php
	lib/Cake/Utility/ClassRegistry.php
	lib/Cake/View/MediaView.php
2012-09-25 16:36:03 +02:00
..
AclInterface.php Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
DbAcl.php Switch usage to Hash where possible. 2012-03-26 22:32:53 -04:00
IniAcl.php rtim files 2012-07-18 03:55:29 +02:00
PhpAcl.php Merge remote-tracking branch 'origin/master' into 2.3 2012-09-25 16:36:03 +02:00