cakephp2-php8/cake
mark_story 6b5c247162 Merge commit 'origin/1.2' into mergers
Conflicts:
	cake/bootstrap.php
	cake/console/cake.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/paginator.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
2009-11-08 22:21:21 -05:00
..
config Removing newline caused by Subversion line removal. 2009-11-06 18:01:22 +11:00
console Merge branch '1.3-misc' into mergers 2009-11-08 21:39:55 -05:00
libs Merge commit 'origin/1.2' into mergers 2009-11-08 22:21:21 -05:00
tests Merge commit 'origin/1.2' into mergers 2009-11-08 22:21:21 -05:00
basics.php Removing newline caused by Subversion line removal. 2009-11-06 18:01:22 +11:00
bootstrap.php Changing import of Dispatcher to direct require. 2009-11-07 17:53:14 -05:00
dispatcher.php Merge commit 'origin/1.2' into mergers 2009-11-08 22:21:21 -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