diff options
| author |  RohanJnr <[email protected]> | 2021-12-13 11:25:27 +0530 |
|---|---|---|
| committer | RohanJnr <[email protected]> | 2021-12-13 11:27:14 +0530 |
| commit | 1261efd75c10bf2031a2019475d4b32c5859d807 (patch) | |
| tree | 6177fadf71677df213106912905149754c628316 /pydis_site/apps/api | |
| parent | Merge branch 'main' into otn_softdel (diff) | |
Merge migrations to avoid conflicts.
Diffstat (limited to 'pydis_site/apps/api')
| -rw-r--r-- | pydis_site/apps/api/migrations/0078_merge_20211213_0552.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pydis_site/apps/api/migrations/0078_merge_20211213_0552.py b/pydis_site/apps/api/migrations/0078_merge_20211213_0552.py new file mode 100644 index 00000000..5ce0e871 --- /dev/null +++ b/pydis_site/apps/api/migrations/0078_merge_20211213_0552.py @@ -0,0 +1,14 @@ +# Generated by Django 3.1.14 on 2021-12-13 05:52 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('api', '0077_use_generic_jsonfield'), + ('api', '0074_merge_20211105_0518'), + ] + + operations = [ + ] |