diff options
| author | tony baldwin <tony@tonybaldwin.org> | 2014-04-12 08:37:56 -0400 |
|---|---|---|
| committer | tony baldwin <tony@tonybaldwin.org> | 2014-04-12 08:37:56 -0400 |
| commit | ebd33b185da1c36e718dfa4a2971c3db35cbda22 (patch) | |
| tree | c23cbf55aac433c90ac254d0684dabf9d4528133 /include/nav.php | |
| parent | 5cca00ddc79dad667464674e08a2a860e262eabd (diff) | |
| parent | d0834c7e1394e1986b2b00e039125deff74d9e5e (diff) | |
| download | volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.gz volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.bz2 volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/css/style.css
whatever
Diffstat (limited to 'include/nav.php')
| -rw-r--r-- | include/nav.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/nav.php b/include/nav.php index 3aa50226d..a97b434bc 100644 --- a/include/nav.php +++ b/include/nav.php @@ -162,7 +162,7 @@ EOT; $nav['home']['mark'] = array('', t('Mark all channel notifications seen'), '',''); - $nav['intros'] = array('connections/pending', t('Intros'), "", t('New Connections')); + $nav['intros'] = array('connections/ifpending', t('Connections'), "", t('Connections')); $nav['notifications'] = array('notifications/system', t('Notices'), "", t('Notifications')); |