From: Nicolas Lœuillet Date: Mon, 3 Feb 2014 10:56:01 +0000 (+0100) Subject: Merge branch 'dev' of git://github.com/mariroz/wallabag into mariroz-dev X-Git-Tag: 1.4.0^2~4 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=f85bfdf186c525056e7c30e6b072b1bea9ba80c9;hp=6af66b1106e67a8dc467a70e8e57d7963b09936b;p=github%2Fwallabag%2Fwallabag.git Merge branch 'dev' of git://github.com/mariroz/wallabag into mariroz-dev --- diff --git a/themes/courgette/_bookmarklet.twig b/themes/courgette/_bookmarklet.twig deleted file mode 100755 index 2e3071ad..00000000 --- a/themes/courgette/_bookmarklet.twig +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/themes/courgette/_footer.twig b/themes/courgette/_footer.twig deleted file mode 100755 index cce31f35..00000000 --- a/themes/courgette/_footer.twig +++ /dev/null @@ -1,4 +0,0 @@ - \ No newline at end of file diff --git a/themes/courgette/_messages.twig b/themes/courgette/_messages.twig deleted file mode 100755 index 679aa098..00000000 --- a/themes/courgette/_messages.twig +++ /dev/null @@ -1 +0,0 @@ - {{ messages | raw }} \ No newline at end of file diff --git a/themes/courgette/config.twig b/themes/courgette/config.twig index 3ab1d92f..26da7289 100755 --- a/themes/courgette/config.twig +++ b/themes/courgette/config.twig @@ -24,7 +24,7 @@

{% trans "Updating poche" %}

{% trans "your version" %} : {{ constant('POCHE_VERSION') }}
{% trans "your version" %} : {{ constant('POCHE') }}
{% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}{% trans "a more recent stable version is available." %}{% else %}{% trans "you are up to date." %}{% endif %}
{% trans "latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}{% trans "a more recent development version is available." %}{% else %}{% trans "you are up to date." %}{% endif %}

diff --git a/themes/courgette/export.twig b/themes/courgette/export.twig deleted file mode 100755 index 4adb9540..00000000 --- a/themes/courgette/export.twig +++ /dev/null @@ -1 +0,0 @@ -{{ export }} \ No newline at end of file diff --git a/themes/courgette/install.twig b/themes/courgette/install.twig deleted file mode 100755 index 20d15f18..00000000 --- a/themes/courgette/install.twig +++ /dev/null @@ -1,28 +0,0 @@ -{% extends "layout.twig" %} -{% block title %}{% trans "installation" %}{% endblock %} -{% block content %} - -{% endblock %} \ No newline at end of file

{% trans "Updating poche" %}

{% trans "install your wallabag" %}