Merge remote-tracking branch 'friendika-master/master' into admin
This commit is contained in:
commit
b1184f3fde
45 changed files with 365 additions and 135 deletions
|
|
@ -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'), "");
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue