Merge branch '2.0' of github.com:cakephp/cakephp into 2.0

This commit is contained in:
Graham Weldon 2011-11-29 23:00:47 +11:00
commit af2e7c1e9b
167 changed files with 7861 additions and 6834 deletions

View file

@ -17,6 +17,7 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
App::uses('AppShell', 'Console/Command');
App::uses('Folder', 'Utility');
/**
@ -24,7 +25,7 @@ App::uses('Folder', 'Utility');
*
* @package Cake.Console.Command
*/
class UpgradeShell extends Shell {
class UpgradeShell extends AppShell {
/**
* Files