cakephp2-php8/cake
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
..
config Removing newline caused by Subversion line removal. 2009-11-06 18:01:22 +11:00
console Merge branch '1.2' into 1.3-merger 2009-11-22 20:38:50 -05:00
libs Merge branch '1.2' into 1.3-merger 2009-11-22 20:38:50 -05:00
tests Merge branch '1.2' into 1.3-merger 2009-11-22 20:38:50 -05:00
basics.php Merge branch '1.2' into 1.3-merger 2009-11-22 20:38:50 -05:00
bootstrap.php Moving error flags to core bootstrap to avoid extra changes in user files, fixing error in previous commit. 2009-08-01 08:36:57 -04:00
dispatcher.php Merge branch '1.2' into 1.3-merger 2009-11-22 20:38:50 -05:00
LICENSE.txt Updating more Copyright dates. 2009-11-06 18:04:38 +11:00
VERSION.txt Updating version numbers for 1.3.0-alpha 2009-11-03 19:52:03 -05:00