Merge branch 'feat/397-398-metricity-db-and-api' of https://github.com/dementati/site into feat/397-398-metricity-db-and-api

2 files changed, 30 insertions, 0 deletions

diff --git a/pydis_site/apps/api/migrations/0064_delete_logentry.py b/pydis_site/apps/api/migrations/0064_delete_logentry.py
new file mode 100644
index 00000000..a5f344d1
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0064_delete_logentry.py
@@ -0,0 +1,16 @@
+# Generated by Django 3.0.9 on 2020-10-03 06:57
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0063_Allow_blank_or_null_for_nomination_reason'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='LogEntry',
+        ),
+    ]
diff --git a/pydis_site/apps/api/migrations/0066_merge_20201003_0730.py b/pydis_site/apps/api/migrations/0066_merge_20201003_0730.py
new file mode 100644
index 00000000..298416db
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0066_merge_20201003_0730.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.9 on 2020-10-03 07:30
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0064_delete_logentry'),
+        ('api', '0065_auto_20200919_2033'),
+    ]
+
+    operations = [
+    ]