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/base.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/base.html.twig')
| -rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/base.html.twig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index 2499bb88..aa388bcb 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig | |||
| @@ -38,6 +38,8 @@ | |||
| 38 | 38 | ||
| 39 | <link rel="shortcut icon" type="image/x-icon" href="{{ asset('wallassets/themes/_global/img/appicon/favicon.ico') }}"> | 39 | <link rel="shortcut icon" type="image/x-icon" href="{{ asset('wallassets/themes/_global/img/appicon/favicon.ico') }}"> |
| 40 | 40 | ||
| 41 | <link rel="manifest" href="{{ asset('manifest.json') }}"> | ||
| 42 | |||
| 41 | {% block css %} | 43 | {% block css %} |
| 42 | {% endblock %} | 44 | {% endblock %} |
| 43 | {% block scripts %} | 45 | {% block scripts %} |