Merge branch 'main' into follow-remote-ids

2020-12-12 09:34:54 -08:00
parent 7204068d2a a6171d6c60
commit 801b6c3a77
16 changed files with 130 additions and 35 deletions
--- a/bookwyrm/templates/snippets/about.html
+++ b/bookwyrm/templates/snippets/about.html
@ -1,7 +1,7 @@
-<h1 class="title">About {{ site_settings.name }}</h1>
+<h1 class="title">About {{ site.name }}</h1>
 <div class="block">
    <img src="/static/images/logo.png" alt="BookWyrm">
 </div>
 <p class="block">
-    {{ site_settings.instance_description }}
+    {{ site.instance_description }}
 </p>