cakephp2-php8/cake
mark_story e149c411fb Merge branch '1.3' into merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/console/shells/tasks/template.php
	cake/dispatcher.php
	cake/libs/controller/component.php
	cake/libs/controller/components/email.php
	cake/libs/controller/scaffold.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	cake/tests/fixtures/datatype_fixture.php
2011-02-05 12:20:09 -05:00
..
config Updating version numbers for 1.3.7 2011-01-19 15:10:53 -05:00
console Merge branch '1.3' into merger 2011-02-05 12:20:09 -05:00
libs Merge branch '1.3' into merger 2011-02-05 12:20:09 -05:00
tests Merge branch '1.3' into merger 2011-02-05 12:20:09 -05:00
basics.php Merge branch '1.3' into merger 2011-01-18 20:04:30 -05:00
bootstrap.php Removing a pointless import in CakeRequest. 2011-02-05 01:28:41 -05:00
LICENSE.txt Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
VERSION.txt Updating version numbers for 1.3.7 2011-01-19 15:10:53 -05:00