aboutsummaryrefslogtreecommitdiffstats
path: root/pydis_site
diff options
context:
space:
mode:
authorGravatar ks129 <[email protected]>2020-05-28 08:49:49 +0300
committerGravatar ks129 <[email protected]>2020-05-28 08:49:49 +0300
commit1e3501b2f27d7e09a873dc3348d196ac2edda68b (patch)
tree6c6f61e09e1740d8c986f84bb9d2582eb814c081 /pydis_site
parentMerge branch 'master' into off-topic-non-random (diff)
OT: Fix migrations nr conflict
Diffstat (limited to 'pydis_site')
-rw-r--r--pydis_site/apps/api/migrations/0052_offtopicchannelname_used.py (renamed from pydis_site/apps/api/migrations/0051_offtopicchannelname_used.py)2
1 files changed, 1 insertions, 1 deletions
diff --git a/pydis_site/apps/api/migrations/0051_offtopicchannelname_used.py b/pydis_site/apps/api/migrations/0052_offtopicchannelname_used.py
index 1b838aec..dfdf3835 100644
--- a/pydis_site/apps/api/migrations/0051_offtopicchannelname_used.py
+++ b/pydis_site/apps/api/migrations/0052_offtopicchannelname_used.py
@@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('api', '0050_remove_infractions_active_default_value'),
+ ('api', '0051_create_news_setting'),
]
operations = [