Merge branch 'main' into switch-edition

2020-12-16 09:21:02 -08:00
parent b2c1bc1481 948e938040
commit 5dbacb3524
15 changed files with 878 additions and 209 deletions
--- a/bookwyrm/migrations/0024_merge_20201216_1721.py
+++ b/bookwyrm/migrations/0024_merge_20201216_1721.py
@ -0,0 +1,14 @@
+# Generated by Django 3.0.7 on 2020-12-16 17:21
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0023_auto_20201214_0511'),
+        ('bookwyrm', '0023_merge_20201216_0112'),
+    ]
+
+    operations = [
+    ]