diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-06-13 20:20:43 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-06-13 20:20:43 +0200 |
| commit | 2b8dc666345d334f50bf2f4f32f0b127edb40c3a (patch) | |
| tree | 0802e16f4fc2c98a706b8d68cea0bcf89549a18d /app/layout/header.phtml | |
| parent | 61f4d5457818204eb28ed394d4f1b97160542baa (diff) | |
| parent | a61180032f6c663ed3946fe0bbdb70ac3b8ec96a (diff) | |
Merge branch 'user-queries' of https://github.com/aledeg/FreshRSS into aledeg-user-queries
Conflicts:
app/layout/nav_menu.phtml
Diffstat (limited to 'app/layout/header.phtml')
| -rw-r--r-- | app/layout/header.phtml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/layout/header.phtml b/app/layout/header.phtml index 08aa7715d..3eedc8ea7 100644 --- a/app/layout/header.phtml +++ b/app/layout/header.phtml @@ -72,6 +72,7 @@ if (Minz_Configuration::canLogIn()) { <li class="item"><a href="<?php echo _url ('configure', 'archiving'); ?>"><?php echo Minz_Translate::t ('archiving_configuration'); ?></a></li> <li class="item"><a href="<?php echo _url ('configure', 'sharing'); ?>"><?php echo Minz_Translate::t ('sharing'); ?></a></li> <li class="item"><a href="<?php echo _url ('configure', 'shortcut'); ?>"><?php echo Minz_Translate::t ('shortcuts'); ?></a></li> + <li class="item"><a href="<?php echo _url ('configure', 'queries'); ?>"><?php echo Minz_Translate::t ('queries'); ?></a></li> <li class="separator"></li> <li class="item"><a href="<?php echo _url ('configure', 'users'); ?>"><?php echo Minz_Translate::t ('users'); ?></a></li> <li class="separator"></li> |