cakephp2-php8/cake
Mark Story d88da3d579 Merge branch '1.3' into 2.0
Conflicts:
	cake/libs/configure.php
	cake/libs/model/connection_manager.php
	cake/libs/model/model.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
2010-09-06 16:53:04 -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-09-06 16:53:04 -04:00
libs Merge branch '1.3' into 2.0 2010-09-06 16:53:04 -04:00
tests Merge branch '1.3' into 2.0 2010-09-06 16:53:04 -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 Moving all the exceptions into one file for the short term. 2010-08-28 00:08:35 -04:00
dispatcher.php Merge branch 'request-response' into 2.0 2010-08-28 00:24:07 -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