Merge branch 'main' into mention_users

2020-11-01 11:09:16 -08:00
parent 85a7e83340 a242a476d9
commit 8ae9519bf2
6 changed files with 82 additions and 27 deletions
--- a/bookwyrm/migrations/0063_user_last_active_date.py
+++ b/bookwyrm/migrations/0063_user_last_active_date.py
@ -0,0 +1,18 @@
+# Generated by Django 3.0.7 on 2020-11-01 17:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0062_auto_20201031_1936'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='last_active_date',
+            field=models.DateTimeField(auto_now=True),
+        ),
+    ]