cakephp2-php8/cake
mark_story f33329ae43 Merge branch 'acl-behavior' into 2.0
Conflicts:
	cake/libs/model/behaviors/acl.php
	cake/tests/cases/libs/model/behaviors/acl.test.php
2011-03-19 10:14:10 -04:00
..
config Updating version numbers for 1.3.7 2011-01-19 15:10:53 -05:00
console Merge branch '1.3' into merger 2011-03-19 09:08:28 -04:00
libs Merge branch 'acl-behavior' into 2.0 2011-03-19 10:14:10 -04:00
tests Merge branch 'acl-behavior' into 2.0 2011-03-19 10:14:10 -04:00
basics.php Making debug() not html escape in cli contexts. 2011-02-26 15:37:28 -05:00
bootstrap.php Removing a pointless import in CakeRequest. 2011-02-05 01:28:41 -05:00
LICENSE.txt Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
VERSION.txt Updating version numbers for 1.3.7 2011-01-19 15:10:53 -05:00