Merge remote-tracking branch 'origin/2.0' into 2.0

This commit is contained in:
Jose Lorenzo Rodriguez 2011-05-22 21:55:07 -04:30
commit 8d52907be7
3 changed files with 42 additions and 6 deletions

View file

@ -314,8 +314,8 @@ class App {
'vendors' => array('%s' . 'Vendor' . DS, VENDORS),
'plugins' => array(
APP . 'Plugin' . DS,
APP . 'plugin' . DS,
dirname(dirname(CAKE)) . DS . 'Plugin' . DS,
APP . 'plugins' . DS,
dirname(dirname(CAKE)) . DS . 'plugins' . DS,
)
);
}