Merge branch 'master' into deleted-messages-visible-line-endings

1 files changed, 18 insertions, 0 deletions

diff --git a/pydis_site/apps/api/migrations/0050_remove_infractions_active_default_value.py b/pydis_site/apps/api/migrations/0050_remove_infractions_active_default_value.py
new file mode 100644
index 00000000..90c91d63
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0050_remove_infractions_active_default_value.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.6 on 2020-02-08 19:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0049_deletedmessage_attachments'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='infraction',
+            name='active',
+            field=models.BooleanField(help_text='Whether the infraction is still active.'),
+        ),
+    ]