cakephp2-php8/cake
mark_story 443f6d1c5b Merge branch '1.3' into merger
Conflicts:
	cake/console/shells/tasks/test.php
	cake/libs/cake_log.php
	cake/libs/controller/components/email.php
	cake/libs/set.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/paginator.php
	cake/libs/view/helpers/time.php
	cake/libs/view/view.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/console/shells/tasks/test.test.php
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/model/db_acl.test.php
	cake/tests/cases/libs/set.test.php
2011-01-08 23:49:19 -05:00
..
config Updating version numbers for 2.0.0-dev 2010-12-26 20:16:48 -05:00
console Merge branch '1.3' into merger 2011-01-08 23:49:19 -05:00
libs Merge branch '1.3' into merger 2011-01-08 23:49:19 -05:00
tests Merge branch '1.3' into merger 2011-01-08 23:49:19 -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 Updating version numbers for 2.0.0-dev 2010-12-26 20:16:48 -05:00