diff options
| author | Thomas Citharel <tcit@tcit.fr> | 2014-11-24 22:56:10 +0100 |
|---|---|---|
| committer | Thomas Citharel <tcit@tcit.fr> | 2014-11-24 22:56:10 +0100 |
| commit | b9c026ce32abed7295d2775640edc0ef89017723 (patch) | |
| tree | 3492511dde4bb1b3ad5e95ef918a68d5f5418d64 /themes/courgette/error.twig | |
| parent | 485d57972ee3c3219652454ff6d7d82a3602bd34 (diff) | |
| parent | 85c5a1ff8d919d3d36a8125c9bbd0d9220025729 (diff) | |
| download | wallabag-b9c026ce32abed7295d2775640edc0ef89017723.tar.gz wallabag-b9c026ce32abed7295d2775640edc0ef89017723.tar.zst wallabag-b9c026ce32abed7295d2775640edc0ef89017723.zip | |
Merge branch 'remove-courgette' into dev
Conflicts:
themes/courgette/_view.twig
Diffstat (limited to 'themes/courgette/error.twig')
| -rwxr-xr-x | themes/courgette/error.twig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/themes/courgette/error.twig b/themes/courgette/error.twig deleted file mode 100755 index 4d4db1f3..00000000 --- a/themes/courgette/error.twig +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | {% extends "layout.twig" %} | ||
| 2 | {% block title %}{% trans "plop" %}{% endblock %} | ||
| 3 | {% block content %} | ||
| 4 | {{ msg|raw }} | ||
| 5 | <p>Don't forget <a href="http://doc.wallabag.org">the documentation</a>.</p> | ||
| 6 | {% endblock %} \ No newline at end of file | ||