Merge branch 'main' into images-django-imagekit

2021-08-11 12:47:25 -06:00
parent 6a365eafb4 19ddcedf14
commit 45e82abda4
134 changed files with 2527 additions and 970 deletions
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@ -65,7 +65,7 @@
        </div>
    </div>
    {% for activity in activities %}
-    <div class="block" id="feed-{{ activity.id }}">
+    <div class="block" id="feed_{{ activity.id }}">
        {% include 'snippets/status/status.html' with status=activity %}
    </div>
    {% endfor %}