From 6ba8dc17a684d79e2b51f6948756bdf7fc597d49 Mon Sep 17 00:00:00 2001 From: sco1 Date: Fri, 19 Jul 2019 18:29:26 -0400 Subject: Attempt a merge migration --- pydis_site/apps/api/migrations/0038_merge_20190719_1817.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 pydis_site/apps/api/migrations/0038_merge_20190719_1817.py (limited to 'pydis_site') 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 = [ + ] -- cgit v1.2.3