Merge branch 'main' into opengraph-image-generation

2021-06-17 15:17:54 -07:00
parent 5966520f0d 321554f17e
commit 973b23856c
86 changed files with 2188 additions and 1834 deletions
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@ -204,7 +204,7 @@
        <div class="columns">
            <div class="column is-one-fifth">
                <p>
-                <a href="{% url 'about' %}">{% trans "About this server" %}</a>
+                <a href="{% url 'about' %}">{% trans "About this instance" %}</a>
                </p>
                {% if site.admin_email %}
                <p>