cakephp2-php8/cake
mark_story b9f0fc0724 Merge branch '1.3' into merger
Conflicts:
	cake/dispatcher.php
	cake/libs/cake_session.php
	cake/libs/controller/components/cookie.php
	cake/libs/controller/components/email.php
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/set.php
	cake/libs/validation.php
	cake/libs/view/view.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/view.test.php
2010-12-10 22:24:31 -05:00
..
config Merge branch '1.3' into merger 2010-11-16 21:48:13 -05:00
console Fixing failing tests caused by constants changing. 2010-12-05 23:32:34 -05:00
libs Merge branch '1.3' into merger 2010-12-10 22:24:31 -05:00
tests Merge branch '1.3' into merger 2010-12-10 22:24:31 -05:00
basics.php Made debug() output html-safe strings by default. 2010-12-10 12:53:45 +11:00
bootstrap.php Moving error handling classes into a separate directory. 2010-11-28 12:27:51 -05:00
LICENSE.txt Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
VERSION.txt Updating version numbers for 1.3.6 2010-11-13 20:01:20 -05:00