Merge branch 'saas-installer-albert' into saas-dev

This commit is contained in:
Albert Santoni 2015-06-10 15:03:11 -04:00
commit c18e728583
336 changed files with 5144 additions and 10180 deletions

View file

@ -66,12 +66,6 @@ $pages = array(
'controller' => 'Preference',
'action' => 'stream-setting'
),
array(
'label' => _('Support Feedback'),
'module' => 'default',
'controller' => 'Preference',
'action' => 'support-setting'
),
array(
'label' => _('Status'),
'module' => 'default',