aboutsummaryrefslogtreecommitdiffstats
path: root/pydis_site
diff options
context:
space:
mode:
authorGravatar Karlis Suvi <[email protected]>2022-01-25 20:24:06 +0200
committerGravatar GitHub <[email protected]>2022-01-25 20:24:06 +0200
commitf390517fd1552e93320149032b63fbe3cff65055 (patch)
treefec0d0a8e8d86ee10766ca6f45c5241f6ccda68b /pydis_site
parentMerge branch 'main' into voicemute (diff)
Try to add merge migration
Diffstat (limited to 'pydis_site')
-rw-r--r--pydis_site/apps/api/migrations/0079_merge_20220125_2022.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/pydis_site/apps/api/migrations/0079_merge_20220125_2022.py b/pydis_site/apps/api/migrations/0079_merge_20220125_2022.py
new file mode 100644
index 00000000..9b9d9326
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0079_merge_20220125_2022.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.1.14 on 2022-01-25 20:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('api', '0078_merge_20211213_0552'),
+ ('api', '0074_voice_mute'),
+ ]
+
+ operations = [
+ ]