mark_story 705e90bef7 Merge branch '1.3' into 2.0-merge ... Conflicts: cake/libs/cache/memcache.php cake/libs/cake_session.php cake/libs/model/behaviors/acl.php cake/tests/cases/dispatcher.test.php cake/tests/cases/libs/cake_test_fixture.test.php cake/tests/cases/libs/model/behaviors/acl.test.php cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php		2010-08-15 23:09:02 -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-merge	2010-08-15 23:09:02 -04:00
libs	Merge branch '1.3' into 2.0-merge	2010-08-15 23:09:02 -04:00
tests	Merge branch '1.3' into 2.0-merge	2010-08-15 23:09:02 -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-merge	2010-08-15 23:09:02 -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