Merge branch 'main' into switch-edition

2020-12-11 16:58:41 -08:00
parent 2d7f8ada61 e2bc751ee4
commit 716068474e
14 changed files with 116 additions and 27 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>