Hot patch, merging two heads.

migrations/versions/dc30b8f6571c_merge_30e017a03948_and_c16d3047abbe.py

@@ -0,0 +1,24 @@
+"""merge 30e017a03948 and c16d3047abbe
+
+Revision ID: dc30b8f6571c
+Revises: 30e017a03948, c16d3047abbe
+Create Date: 2021-07-12 11:11:47.410647
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'dc30b8f6571c'
+down_revision = ('30e017a03948', 'c16d3047abbe')
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass