aboutsummaryrefslogtreecommitdiff
path: root/src/web/templates
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2017-05-23 15:37:50 +0200
committerCédric Bonhomme <cedric@cedricbonhomme.org>2017-05-23 15:37:50 +0200
commita756a3e9da58df6247e3437be4c13da25dab1aa0 (patch)
tree60281271606a5cc6b718d65d998c2d97b3fa4c50 /src/web/templates
parentAdded UTF-8 version of the logo. (diff)
parentUpdate tags of bookmarks. (diff)
downloadnewspipe-a756a3e9da58df6247e3437be4c13da25dab1aa0.tar.gz
newspipe-a756a3e9da58df6247e3437be4c13da25dab1aa0.tar.bz2
newspipe-a756a3e9da58df6247e3437be4c13da25dab1aa0.zip
Fixed conflicts.
Diffstat (limited to 'src/web/templates')
-rw-r--r--src/web/templates/bookmarks.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/web/templates/bookmarks.html b/src/web/templates/bookmarks.html
index fc0e3aaa..3e65d2c0 100644
--- a/src/web/templates/bookmarks.html
+++ b/src/web/templates/bookmarks.html
@@ -6,7 +6,7 @@
{% for bookmark in bookmarks %}
<li class="list-group-item">
<a href="{{ bookmark.href }}">{{ bookmark.href }}</a>&nbsp;
- <a href="{{ bookmark.href }}">{{ bookmark.tags }}</a>&nbsp;
+ <a href="{{ bookmark.href }}">{{ bookmark.tags_proxy }}</a>&nbsp;
<a href="{{ url_for('bookmark.form', bookmark_id=bookmark.id) }}">edit</a>
</li>
{% endfor %}
bgstack15