aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar sco1 <[email protected]>2019-07-19 18:29:26 -0400
committerGravatar sco1 <[email protected]>2019-07-19 18:29:26 -0400
commit6ba8dc17a684d79e2b51f6948756bdf7fc597d49 (patch)
treec2cf43c62d627c78411414fcbe55d7d711b1ef64
parentMerge branch 'django' into low-hanging-merge-fruit (diff)
Attempt a merge migration
-rw-r--r--pydis_site/apps/api/migrations/0038_merge_20190719_1817.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/pydis_site/apps/api/migrations/0038_merge_20190719_1817.py b/pydis_site/apps/api/migrations/0038_merge_20190719_1817.py
new file mode 100644
index 00000000..532bcb70
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0038_merge_20190719_1817.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.3 on 2019-07-19 22:17
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('api', '0037_nomination_field_name_change'),
+ ('api', '0036_removing_snake_apis'),
+ ]
+
+ operations = [
+ ]