cakephp2-php8/lib/Cake/Controller/Component/Acl
ADmad d466e00644 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
	lib/Cake/Utility/Folder.php
	lib/Cake/VERSION.txt
2014-05-04 14:35:36 +05:30
..
AclInterface.php correct return types in doc blocks 2013-07-05 17:19:22 +02:00
DbAcl.php Improved the DocBlocks and other code cleanup 2013-05-31 00:11:19 +02:00
IniAcl.php Updated documentation 2014-04-11 15:10:56 -04:00
PhpAcl.php Merge branch 'master' into 2.5 2014-05-04 14:35:36 +05:30