Merge branch 'main' into production

2020-11-01 11:14:01 -08:00 · 2020-11-01 11:14:01 -08:00 · bfef6f2d8a
parent 875b473711 76a4f0e9a7
commit bfef6f2d8a
1 changed files with 14 additions and 0 deletions
--- a/bookwyrm/migrations/0064_merge_20201101_1913.py
+++ b/bookwyrm/migrations/0064_merge_20201101_1913.py
@ -0,0 +1,14 @@
+# Generated by Django 3.0.7 on 2020-11-01 19:13
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0063_user_last_active_date'),
+        ('bookwyrm', '0063_auto_20201101_1758'),
+    ]
+
+    operations = [
+    ]