Merge remote-tracking branch 'friendika-master/master' into admin

This commit is contained in:
Fabio Comuni
2011-06-14 10:37:54 +02:00
45 changed files with 365 additions and 135 deletions

View File

@@ -64,8 +64,8 @@ function nav(&$a) {
$nav['help'] = array($help_url, t('Help'), "");
$nav['apps'] = array('apps', t('Apps'), "");
if($a->apps)
$nav['apps'] = array('apps', t('Apps'), "");
$nav['search'] = array('search', t('Search'), "");