Merge branch 'main' into form-conflict

2022-03-16 16:51:57 -07:00
parent 44e68cd0a4 ffec47ad9a
commit 7b3b357756
51 changed files with 4388 additions and 2813 deletions
--- a/bookwyrm/models/site.py
+++ b/bookwyrm/models/site.py
@ -27,6 +27,7 @@ class SiteSettings(models.Model):
    default_theme = models.ForeignKey(
        "Theme", null=True, blank=True, on_delete=models.SET_NULL
    )
+    version = models.CharField(null=True, blank=True, max_length=10)

    # admin setup options
    install_mode = models.BooleanField(default=False)