cakephp2-php8/cake
Mark Story 6c3c5e9012 Merge remote branch 'rchavik/ticket_293' into 1.3
Conflicts:
	cake/libs/controller/components/email.php
2010-02-07 16:26:37 -05:00
..
config Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
console Changing the class name to lowercase before ordering the ClassRegistry in PHP 4 to not have problems of duplication of tasks in the shell. Fixes #186. 2010-02-01 12:07:20 -05:00
libs Merge remote branch 'rchavik/ticket_293' into 1.3 2010-02-07 16:26:37 -05:00
tests Merge remote branch 'rchavik/ticket_293' into 1.3 2010-02-07 16:26:37 -05:00
basics.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
bootstrap.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
dispatcher.php Fixing include errors caused by empty asset filters in Dispatcher::asset(). Fixes #313 2010-02-07 15:19:47 -05:00
LICENSE.txt Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
VERSION.txt Updating version numbers. to 1.3.0-beta 2010-01-16 20:38:08 -05:00