cakephp2-php8/cake
mark_story 58383d3cb9 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/model.php
2009-11-15 20:05:55 -05:00
..
config Removing newline caused by Subversion line removal. 2009-11-06 18:01:22 +11:00
console Removing console/libs/templates. Has been moved in 1.3 and a merge with 1.2 added it again. 2009-11-13 09:15:31 -05:00
libs Merge branch '1.2' into 1.3-merger 2009-11-15 20:05:55 -05:00
tests Merge branch '1.2' into 1.3-merger 2009-11-15 20:05:55 -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 branch '1.2' into 1.3-merger 2009-11-15 20:05:55 -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