Merge remote branch 'upstream/dev' into dev

Conflicts:
	themes/default/_head.twig

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 @@
 
             <h2>{% trans "Updating poche" %}</h2>
             <ul>
-                <li>{% trans "your version" %} : <strong>{{ constant('POCHE_VERSION') }}</strong></li>
+                <li>{% trans "your version" %} : <strong>{{ constant('POCHE') }}</strong></li>
                 <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>
                 {% 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 %}
             </ul>
@@ -77,4 +77,4 @@
 
             <h2>{% trans "Export your poche datas" %}</h2>
             <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your poche datas." %}</p>
-{% endblock %}
\ No newline at end of file
+{% endblock %}