diff options
| author | Felix Favre <gnomus@gnomus.de> | 2014-08-24 15:52:25 +0200 |
|---|---|---|
| committer | Felix Favre <gnomus@gnomus.de> | 2014-08-24 15:52:25 +0200 |
| commit | 4faca9864f80dfd90cba248855602ab7680cab53 (patch) | |
| tree | 9f2d5d76adc7d14e89d51c0073103e9d7ad717f4 /includes/sys_menu.php | |
| parent | efe853246f99c59e48ac66955b40fb7e09da0a5b (diff) | |
| parent | f9e577352dd31f2846c3a340a1de82dd73961568 (diff) | |
Merge branch 'master' of github.com:planetcyborg/engelsystem
Conflicts:
themes/theme1.scss
Diffstat (limited to 'includes/sys_menu.php')
| -rw-r--r-- | includes/sys_menu.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/includes/sys_menu.php b/includes/sys_menu.php index 830bd4e3..89c07572 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -54,7 +54,6 @@ function make_navigation() { "angeltypes" => angeltypes_title(), "user_messages" => messages_title() . ' ' . user_unread_messages(), "user_questions" => questions_title(), - "user_wakeup" => wakeup_title(), "admin_arrive" => admin_arrive_title(), "admin_active" => admin_active_title(), "admin_user" => admin_user_title(), |