Merge branch 'dev' into saveclick2search

This commit is contained in:
tcit 2014-10-04 18:47:56 +02:00
commit f183f72bf4

View File

@ -120,7 +120,6 @@
<p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
<h2>{% trans "Export your wallabag data" %}</h2>
{% if constant('STORAGE') == 'sqlite' %}
<p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
<h2>{% trans "Cache" %}</h2>