aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes/default/config.twig
diff options
context:
space:
mode:
authorJean-Christophe Saad-Dupuy <saad.dupuy@gmail.com>2013-10-07 14:25:24 +0200
committerJean-Christophe Saad-Dupuy <saad.dupuy@gmail.com>2013-10-07 14:25:24 +0200
commit5e07dc8b51f9612de5f5a00bbac399c777e82fa4 (patch)
tree66454b9a6dd4e8cd045dd8451a268cf914e583b8 /themes/default/config.twig
parent2916d24b209e1e36cf22cb902d7e6dc34113c7e5 (diff)
parent894c36ea32d38d425e27dae43a29dcd9e669040e (diff)
downloadwallabag-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/config.twig')
-rw-r--r--themes/default/config.twig4
1 files changed, 2 insertions, 2 deletions
diff --git a/themes/default/config.twig b/themes/default/config.twig
index 0f1aea80..13bdaafd 100644
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -23,7 +23,7 @@
23 23
24 <h2>{% trans "Updating poche" %}</h2> 24 <h2>{% trans "Updating poche" %}</h2>
25 <ul> 25 <ul>
26 <li>{% trans "your version" %} : <strong>{{ constant('POCHE_VERSION') }}</strong></li> 26 <li>{% trans "your version" %} : <strong>{{ constant('POCHE') }}</strong></li>
27 <li>{% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://inthepoche.com/">{% trans "a more recent stable version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li> 27 <li>{% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://inthepoche.com/">{% trans "a more recent stable version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>
28 {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://inthepoche.com/">{% trans "a more recent development version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>{% endif %} 28 {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://inthepoche.com/">{% trans "a more recent development version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>{% endif %}
29 </ul> 29 </ul>
@@ -77,4 +77,4 @@
77 77
78 <h2>{% trans "Export your poche datas" %}</h2> 78 <h2>{% trans "Export your poche datas" %}</h2>
79 <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your poche datas." %}</p> 79 <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your poche datas." %}</p>
80{% endblock %} \ No newline at end of file 80{% endblock %}