aboutsummaryrefslogtreecommitdiffstats
path: root/pydis_site/apps/api/migrations
diff options
context:
space:
mode:
authorGravatar kosayoda <[email protected]>2020-07-16 15:52:02 +0800
committerGravatar kosayoda <[email protected]>2020-07-16 15:52:02 +0800
commitfbcf39f2bb05b9746ac911d25c2118ac9cf9dff3 (patch)
tree92d7a529ef5dd20a553c83e139d1e281c485eac2 /pydis_site/apps/api/migrations
parentMerge branch 'master' of github.com:python-discord/site into role-reminders (diff)
Merge migrations
Diffstat (limited to 'pydis_site/apps/api/migrations')
-rw-r--r--pydis_site/apps/api/migrations/0057_merge_20200716_0751.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/pydis_site/apps/api/migrations/0057_merge_20200716_0751.py b/pydis_site/apps/api/migrations/0057_merge_20200716_0751.py
new file mode 100644
index 00000000..47a6d2d4
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0057_merge_20200716_0751.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.14 on 2020-07-16 07:51
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('api', '0055_reminder_mentions'),
+ ('api', '0056_allow_blank_user_roles'),
+ ]
+
+ operations = [
+ ]