Merge branch 'main' into themes

bookwyrm/migrations/0142_user_hide_follows.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.12 on 2022-02-28 19:44
+
+import bookwyrm.models.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0141_alter_report_status"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="hide_follows",
+            field=bookwyrm.models.fields.BooleanField(default=False),
+        ),
+    ]