cakephp2-php8/cake
mark_story dca3fecfed Merge branch '1.3' into merger
Conflicts:
	cake/console/error.php
	cake/libs/cache/memcache.php
	cake/libs/cake_session.php
	cake/libs/controller/components/request_handler.php
	cake/libs/model/cake_schema.php
	cake/libs/router.php
	cake/libs/set.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/text.php
	cake/libs/view/view.php
	cake/tests/cases/libs/set.test.php
2011-01-18 20:04:30 -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-18 20:04:30 -05:00
libs Merge branch '1.3' into merger 2011-01-18 20:04:30 -05:00
tests Merge branch '1.3' into merger 2011-01-18 20:04:30 -05:00
basics.php Merge branch '1.3' into merger 2011-01-18 20:04:30 -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