cakephp2-php8/app/config
mark_story 4d37e75f18 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/controller/components/cookie.php
	cake/libs/debugger.php
	cake/libs/flay.php
	cake/libs/http_socket.php
	cake/libs/inflector.php
	cake/libs/model/cake_schema.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/router.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/js.php
2009-11-22 20:38:50 -05:00
..
schema Update license lines throughout. 2009-11-06 17:51:51 +11:00
acl.ini.php Update license lines throughout. 2009-11-06 17:51:51 +11:00
bootstrap.php Fixing docblock in bootstrap.php, adding missing quote. 2009-11-10 09:24:56 -05:00
core.php Merge branch '1.2' into 1.3-merger 2009-11-22 20:38:50 -05:00
database.php.default merging 1.3-misc into master 2009-05-01 14:05:46 -07:00
routes.php Update license lines throughout. 2009-11-06 17:51:51 +11:00