From: Nicolas Lœuillet Date: Fri, 30 Dec 2016 12:50:44 +0000 (+0100) Subject: Merge pull request #2725 from lapineige/master X-Git-Tag: 2.2.0~3^2~12 X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=339b1e689d96b433d88ca1ad2325031841ae450d Merge pull request #2725 from lapineige/master Share to Shaarli - Include tags --- 339b1e689d96b433d88ca1ad2325031841ae450d diff --cc src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 2e9673d5,950b3909..8ac2bc0b --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@@ -29,9 -29,8 +29,9 @@@ {% endif %} {% if craue_setting('share_twitter') %}
    • {% endif %} {% if craue_setting('share_mail') %}
    • {% endif %} - {% if craue_setting('share_shaarli') %}
  • shaarli
    • {% endif %} + {% if craue_setting('share_shaarli') %}
  • shaarli
    • {% endif %} {% if craue_setting('share_diaspora') %}
  • diaspora
    • {% endif %} + {% if craue_setting('share_unmark') %}
  • unmark.it
    • {% endif %} {% if craue_setting('carrot') %}
  • Carrot
    • {% endif %} {% if craue_setting('show_printlink') %}
  • {{ 'entry.view.left_menu.print'|trans }}
    • {% endif %} {% if craue_setting('export_epub') %}
  • EPUB
    • {% endif %}