From: Trenton Holmes <holmes.trenton@gmail.com>
Date: Wed, 24 Aug 2022 13:43:52 +0000 (-0700)
Subject: Merges the migration branches
X-Git-Tag: v1.9.0-beta.rc1~26^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d39b4ae8cb89c4b07f0e101c7faaeee9806238f8;p=thirdparty%2Fpaperless-ngx.git

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
index 0000000000..4a2b9706ad
--- /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 = []