cakephp2-php8/cake
mark_story ee3017599d Merge branch '2.0' into 2.0-pagination
Conflicts:
	cake/libs/controller/components/paginator.php
	cake/libs/router.php
2010-12-24 14:43:11 -05:00
..
config Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
console Fixing more @package tags, and removing duplicate tags in classes. 2010-12-24 14:33:41 -05:00
libs Merge branch '2.0' into 2.0-pagination 2010-12-24 14:43:11 -05:00
tests Merge branch '2.0' into 2.0-pagination 2010-12-24 14:43:11 -05:00
basics.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
bootstrap.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
LICENSE.txt Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
VERSION.txt Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00