From: Trenton H <797416+stumpylog@users.noreply.github.com>
Date: Wed, 29 Mar 2023 16:40:10 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/dev' into feature-multiple-barcode-scanners
X-Git-Tag: v1.14.0-beta.rc1~15^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F2907%2Fhead;p=thirdparty%2Fpaperless-ngx.git

Merge remote-tracking branch 'origin/dev' into feature-multiple-barcode-scanners
---

66929a908850426dcd7b55525a879fa838b7b8a6
diff --cc Pipfile
index cfc32071c2,7058b8ff17..b89eff575f
--- a/Pipfile
+++ b/Pipfile
@@@ -57,6 -58,6 +58,7 @@@ nltk = "*
  pdf2image = "*"
  flower = "*"
  bleach = "*"
++zxing-cpp = {version = "*", platform_machine = "== 'x86_64'"}
  #
  # Packages locked due to issues (try to check if these are fixed in a release every so often)
  #
diff --cc Pipfile.lock
index 2196919255,b3bfc3ba81..5ab143b349
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@@ -1,7 -1,7 +1,7 @@@
  {
      "_meta": {
          "hash": {
-             "sha256": "d813537b3e32ac288b7a89f85041b1b52b4bf69b349dd0df4a1283dc17ce2275"
 -            "sha256": "01320f2ef2a561c37d17aaad61a7871b5a379dd1ac97fdaab586936b60dec92e"
++            "sha256": "8395f25f876a71a7307a55dd542e69a4cdcb3be3be38c4e89ed06ce3d52a5345"
          },
          "pipfile-spec": 6,
          "requires": {},
@@@ -55,7 -48,7 +48,7 @@@
                  "sha256:2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15",
                  "sha256:8ca1e4fcf50d07413d66d1a5e416e42cfdf5851c981d679a09851a6853383b3c"
              ],
-             "markers": "python_version >= '3.6'",
 -            "markers": "python_version < '3.11'",
++            "markers": "python_full_version <= '3.11.2'",
              "version": "==4.0.2"
          },
          "attrs": {