cakephp2-php8/cake
mark_story 3ea8c2246a Merge branch '1.3' into merger
Conflicts:
	cake/console/cake.php
	cake/dispatcher.php
	cake/libs/controller/components/cookie.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/ajax.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/model/model_validation.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/lib/cake_test_fixture.php
2011-03-01 22:21:44 -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-03-01 22:21:44 -05:00
libs Merge branch '1.3' into merger 2011-03-01 22:21:44 -05:00
tests Merge branch '1.3' into merger 2011-03-01 22:21:44 -05:00
basics.php Making debug() not html escape in cli contexts. 2011-02-26 15:37:28 -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