From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Fri, 30 Dec 2022 04:12:42 +0000 (-0800)
Subject: Merge branch 'dev' into feature-permissions
X-Git-Tag: v1.14.0-beta.rc1~109^2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d71d388c0872de41be1cae2e1cfba1c44a09f6d0;p=thirdparty%2Fpaperless-ngx.git

Merge branch 'dev' into feature-permissions
---

d71d388c0872de41be1cae2e1cfba1c44a09f6d0
diff --cc Pipfile.lock
index 09aa27b8a8,585d8ede7f..5501e0fd56
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@@ -402,21 -386,13 +394,21 @@@
              "index": "pypi",
              "version": "==3.14.0"
          },
 +        "djangorestframework-guardian": {
 +            "hashes": [
 +                "sha256:1883756452d9bfcc2a51fb4e039a6837a8f6697c756447aa83af085749b59330",
 +                "sha256:3bd3dd6ea58e1bceca5048faf6f8b1a93bb5dcff30ba5eb91b9a0e190a48a0c7"
 +            ],
 +            "index": "pypi",
 +            "version": "==0.3.0"
 +        },
          "filelock": {
              "hashes": [
-                 "sha256:55447caa666f2198c5b6b13a26d2084d26fa5b115c00d065664b2124680c4edc",
-                 "sha256:617eb4e5eedc82fc5f47b6d61e4d11cb837c56cb4544e39081099fa17ad109d4"
+                 "sha256:7b319f24340b51f55a2bf7a12ac0755a9b03e718311dac567a0f4f7fabd2f5de",
+                 "sha256:f58d535af89bb9ad5cd4df046f741f8553a418c01a7856bf0d173bbc9f6bd16d"
              ],
              "index": "pypi",
-             "version": "==3.8.0"
+             "version": "==3.9.0"
          },
          "flower": {
              "hashes": [