diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-11-25 09:58:18 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-11-25 09:58:18 +0100 |
| commit | b878be4cc99fd4927c70b59386cf7a57b33bb381 (patch) | |
| tree | 9a5186ead93b9f6114b5341a7713f614eb58f6ec /src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |
| parent | e673b54f702f274a087e4feff409663d9636e57b (diff) | |
| parent | bffe65478de71113a16f6e7a7ef75845c9d61180 (diff) | |
| download | wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.tar.gz wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.tar.zst wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.zip | |
Merge remote-tracking branch 'origin/master' into 2.4
# Conflicts:
# web/wallassets/baggy.js
# web/wallassets/manifest.json
# web/wallassets/material.css
# web/wallassets/material.js
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig')
| -rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index f0012ad9..052a8c01 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
| @@ -143,7 +143,7 @@ | |||
| 143 | </div> | 143 | </div> |
| 144 | <div class="col s12 l4"> | 144 | <div class="col s12 l4"> |
| 145 | <p class="footer-text"> | 145 | <p class="footer-text"> |
| 146 | {{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a> – | 146 | {{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" rel="noopener" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a> – |
| 147 | <a class="grey-text text-lighten-4" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans|lower }}</a> | 147 | <a class="grey-text text-lighten-4" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans|lower }}</a> |
| 148 | </p> | 148 | </p> |
| 149 | </div> | 149 | </div> |