diff options
| author | Jean-Christophe Saad-Dupuy <saad.dupuy@gmail.com> | 2013-10-07 14:25:24 +0200 |
|---|---|---|
| committer | Jean-Christophe Saad-Dupuy <saad.dupuy@gmail.com> | 2013-10-07 14:25:24 +0200 |
| commit | 5e07dc8b51f9612de5f5a00bbac399c777e82fa4 (patch) | |
| tree | 66454b9a6dd4e8cd045dd8451a268cf914e583b8 /themes/default/error.twig | |
| parent | 2916d24b209e1e36cf22cb902d7e6dc34113c7e5 (diff) | |
| parent | 894c36ea32d38d425e27dae43a29dcd9e669040e (diff) | |
| download | wallabag-5e07dc8b51f9612de5f5a00bbac399c777e82fa4.tar.gz wallabag-5e07dc8b51f9612de5f5a00bbac399c777e82fa4.tar.zst wallabag-5e07dc8b51f9612de5f5a00bbac399c777e82fa4.zip | |
Merge remote branch 'upstream/dev' into dev
Conflicts:
themes/default/_head.twig
Diffstat (limited to 'themes/default/error.twig')
| -rw-r--r-- | themes/default/error.twig | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/themes/default/error.twig b/themes/default/error.twig index c829d12b..99eb1ed6 100644 --- a/themes/default/error.twig +++ b/themes/default/error.twig | |||
| @@ -1,6 +1,11 @@ | |||
| 1 | {% extends "layout.twig" %} | 1 | {% extends "layout.twig" %} |
| 2 | {% block title %}{% trans "plop" %}{% endblock %} | 2 | {% block title %}{% trans "plop" %}{% endblock %} |
| 3 | {% block content %} | 3 | {% block content %} |
| 4 | {{ msg|raw }} | 4 | <h1>Errors</h1> |
| 5 | <p>Don't forget <a href="http://inthepoche.com/doc">the documentation</a>.</p> | 5 | <ol> |
| 6 | {% for message in msg %} | ||
| 7 | <li>{{message}}</li> | ||
| 8 | {% endfor %} | ||
| 9 | </ol> | ||
| 10 | <p>Don't forget <a href="http://inthepoche.com/doc">the documentation</a>.</p> | ||
| 6 | {% endblock %} \ No newline at end of file | 11 | {% endblock %} \ No newline at end of file |