cakephp2-php8/cake
mark_story d38857095a Merge branch '1.3' into 2.0
Conflicts:
	cake/libs/model/model.php
	cake/libs/validation.php
	cake/libs/view/helpers/ajax.php
	cake/tests/cases/libs/controller/components/session.test.php
2010-07-24 22:34:42 -04:00
..
config Updating version numbers to 1.3.3 2010-07-18 23:00:24 -04:00
console Merge branch '1.3' into 2.0 2010-07-24 22:34:42 -04:00
libs Merge branch '1.3' into 2.0 2010-07-24 22:34:42 -04:00
tests Merge branch '1.3' into 2.0 2010-07-24 22:34:42 -04:00
basics.php Changing Configure::read() to not have a default value, and instead return all values in configure when no param is supplied. Test cases updated. Fixes #503 2010-07-05 21:50:36 -04:00
bootstrap.php Removing PHP5 and all its uses. 2010-07-05 22:19:22 -04:00
dispatcher.php Merge branch '1.3' into 2.0 2010-07-24 22:34:42 -04:00
LICENSE.txt Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
VERSION.txt Updating version numbers to 1.3.3 2010-07-18 23:00:24 -04:00