diff options
author | Alexandr Danilov <bitbucket@modos189.ru> | 2015-08-10 12:27:12 +0300 |
---|---|---|
committer | Alexandr Danilov <bitbucket@modos189.ru> | 2015-08-10 12:27:12 +0300 |
commit | 4919584b8758b23e127536b686776c1c41b3d215 (patch) | |
tree | 80288df2d6588fd84d0d028fe0ea652131a48c9a /src/Wallabag/CoreBundle/Resources/views/base.html.twig | |
parent | 946d6a512470613aa5ffa556b6547397064dd89f (diff) | |
parent | 47cadf36c8f7c20ba1edf26e184637d33a52cf35 (diff) | |
download | wallabag-4919584b8758b23e127536b686776c1c41b3d215.tar.gz wallabag-4919584b8758b23e127536b686776c1c41b3d215.tar.zst wallabag-4919584b8758b23e127536b686776c1c41b3d215.zip |
Merge remote-tracking branch 'origin/v2' into v2_fix_material
# Conflicts:
# src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/base.html.twig')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/base.html.twig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index f17feedd..162fb463 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig | |||
@@ -71,7 +71,7 @@ | |||
71 | <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li> | 71 | <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li> |
72 | <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li> | 72 | <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li> |
73 | <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li> | 73 | <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li> |
74 | <li><a href="?view=tags">{% trans %}tags{% endtrans %}</a></li> | 74 | <li><a href="{{ path ('tag') }}">{% trans %}tags{% endtrans %}</a></li> |
75 | <li><a href="{{ path('new_entry') }}">{% trans %}save a link{% endtrans %}</a></li> | 75 | <li><a href="{{ path('new_entry') }}">{% trans %}save a link{% endtrans %}</a></li> |
76 | <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a> | 76 | <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a> |
77 | <div id="search-form" class="messages info popup-form"> | 77 | <div id="search-form" class="messages info popup-form"> |