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/_footer.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/_footer.twig')
| -rw-r--r-- | themes/default/_footer.twig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/themes/default/_footer.twig b/themes/default/_footer.twig index 2b895854..06148a57 100644 --- a/themes/default/_footer.twig +++ b/themes/default/_footer.twig | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <footer class="w600p center mt3 mb3 smaller txtright"> | 1 | <footer class="w600p center mt3 mb3 smaller txtright"> |
| 2 | <p>{% trans "powered by" %} <a href="http://inthepoche.com">poche</a></p> | 2 | <p>{% trans "powered by" %} <a href="http://inthepoche.com">poche</a></p> |
| 3 | {% if constant('DEBUG_POCHE') == 1 %}<p><strong>{% trans "debug mode is on so cache is off." %} {% trans "your poche version:" %}{{constant('POCHE_VERSION')}}. {% trans "storage:" %} {{constant('STORAGE')}}</strong></p>{% endif %} | 3 | {% if constant('DEBUG_POCHE') == 1 %}<p><strong>{% trans "debug mode is on so cache is off." %} {% trans "your poche version:" %}{{constant('POCHE')}}. {% trans "storage:" %} {{constant('STORAGE')}}</strong></p>{% endif %} |
| 4 | </footer> \ No newline at end of file | 4 | </footer> \ No newline at end of file |