Merge branch 'master' of dev.sourcefabric.org:campcaster

This commit is contained in:
Naomi 2011-01-27 18:38:24 -05:00
commit 7ef4380f25
1 changed files with 6 additions and 12 deletions

View File

@ -49,14 +49,6 @@ $pages = array(
'action' => 'plupload',
'resource' => 'plupload'
),
array(
'label' => 'Add User',
'module' => 'default',
'controller' => 'user',
'action' => 'add-user',
'resource' => 'user'
),
array(
'label' => 'Configure',
'uri' => 'javascript:void(null)',
@ -67,10 +59,12 @@ $pages = array(
'controller' => 'Nowplaying'
),
array(
'label' => 'Manage Users',
'module' => 'default',
'controller' => 'Nowplaying'
)
'label' => 'Manage Users',
'module' => 'default',
'controller' => 'user',
'action' => 'add-user',
'resource' => 'user'
)
)
)
/*