Merges the migration branches

diff --git a/src/documents/migrations/1024_merge_20220824_1341.py b/src/documents/migrations/1024_merge_20220824_1341.py
new file mode 100644 (file)
index 0000000..4a2b970
--- /dev/null
+++ b/src/documents/migrations/1024_merge_20220824_1341.py
@@ -0,0 +1,13 @@
+# Generated by Django 4.0.6 on 2022-08-24 13:41
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("documents", "1023_add_comments"),
+        ("documents", "1023_document_original_filename"),
+    ]
+
+    operations = []