Merge branch 'master' into 2.7

This commit is contained in:
mark_story 2015-02-10 23:00:43 -05:00
commit eb85a875c0
13 changed files with 125 additions and 18 deletions

View file

@ -123,7 +123,7 @@ class PluginTask extends AppShell {
'Test' . DS . 'Fixture',
'View' . DS . 'Elements',
'View' . DS . 'Helper',
'View' . DS . 'Layout',
'View' . DS . 'Layouts',
'webroot' . DS . 'css',
'webroot' . DS . 'js',
'webroot' . DS . 'img',