cakephp2-php8/cake/libs/controller/components
mark_story 5717e3b59c Merge branch '1.2' into 1.2-merger
Conflicts:
	app/webroot/test.php
	cake/VERSION.txt
	cake/bootstrap.php
	cake/config/config.php
	cake/console/cake.php
	cake/console/libs/schema.php
	cake/console/templates/skel/webroot/test.php
	cake/libs/configure.php
	cake/tests/cases/console/libs/schema.test.php
	cake/tests/cases/libs/debugger.test.php
	cake/tests/cases/libs/model/model_write.test.php
	cake/tests/fixtures/aco_fixture.php
2009-09-16 01:23:49 -04:00
..
acl.php Merge branch '1.3-misc' into 1.3 2009-08-02 12:20:07 -07:00
auth.php replace deprecated method calls. 2009-09-11 06:58:23 -04:00
cookie.php Updating test case to reflect API changes. 2009-08-31 22:52:15 -04:00
email.php Merge branch '1.2' into 1.2-merger 2009-09-16 01:23:49 -04:00
request_handler.php whitespace normalization 2009-08-02 16:10:24 -07:00
security.php Merge branch '1.2' into 1.3 2009-08-03 13:13:18 -07:00
session.php Updating session component, to not use layout, and use elements instead. 2009-08-31 23:59:40 -04:00