aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Akarys42 <[email protected]>2019-11-07 19:09:53 +0100
committerGravatar Akarys42 <[email protected]>2019-11-07 19:09:53 +0100
commitf06148f6efb89e85a8dfad60cce21d5f6b95d505 (patch)
treef3766f35e66cb7144c441d396db3f2d99c409e4d
parentMerge branch 'master' into #222-offensive-msg-autodeletion (diff)
Merge master migration files
-rw-r--r--pydis_site/apps/api/migrations/0049_offensivemessage.py (renamed from pydis_site/apps/api/migrations/0047_offensivemessage.py)4
1 files changed, 2 insertions, 2 deletions
diff --git a/pydis_site/apps/api/migrations/0047_offensivemessage.py b/pydis_site/apps/api/migrations/0049_offensivemessage.py
index f2068c1b..fe4a1961 100644
--- a/pydis_site/apps/api/migrations/0047_offensivemessage.py
+++ b/pydis_site/apps/api/migrations/0049_offensivemessage.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.6 on 2019-11-07 17:55
+# Generated by Django 2.2.6 on 2019-11-07 18:08
import django.core.validators
from django.db import migrations, models
@@ -9,7 +9,7 @@ import pydis_site.apps.api.models.utils
class Migration(migrations.Migration):
dependencies = [
- ('api', '0046_reminder_jump_url'),
+ ('api', '0048_add_infractions_unique_constraints_active'),
]
operations = [