Merge branch 'main' into suggestions-redis

2021-08-02 16:40:57 -07:00
parent beb42b17f1 dca7057745
commit fc8db58cdb
59 changed files with 4207 additions and 1252 deletions
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@ -1,4 +1,4 @@
-{% extends 'feed/feed_layout.html' %}
+{% extends 'feed/layout.html' %}
 {% load i18n %}

 {% block panel %}