mark_story f21161ef46 Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0 ... differences upon merging. Conflicts: app/config/core.php cake/console/templates/skel/config/core.php cake/libs/cache/file.php cake/libs/cake_session.php cake/libs/controller/components/email.php cake/libs/i18n.php cake/libs/view/pages/home.ctp cake/tests/cases/libs/cache/memcache.test.php cake/tests/cases/libs/model/model_write.test.php		2010-09-24 23:27:22 -04:00
..
dbo_mssql.php	Merge branch '2.0-phpunit' into 2.0	2010-06-28 22:31:35 -04:00
dbo_mysql.php	Merge branch '1.3' into 2.0	2010-09-06 16:53:04 -04:00
dbo_mysqli.php	Merge branch '1.3' into 2.0	2010-06-26 12:29:20 -04:00
dbo_oracle.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
dbo_postgres.php	Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0	2010-09-24 23:27:22 -04:00
dbo_sqlite.php	Merge branch '2.0-phpunit' into 2.0	2010-06-28 22:31:35 -04:00