From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Tue, 14 Feb 2023 19:35:48 +0000 (-0800)
Subject: Merge branch 'dev' into feature-permissions
X-Git-Tag: v1.14.0-beta.rc1~109^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f57873fb1bc2e719051025416fb9ba970509a5dc;p=thirdparty%2Fpaperless-ngx.git

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

f57873fb1bc2e719051025416fb9ba970509a5dc
diff --cc Pipfile
index 3dd4cde3bc,09065956bc..2684ef2dab
--- a/Pipfile
+++ b/Pipfile
@@@ -56,16 -57,10 +57,13 @@@ bleach = "*
  #
  # Packages locked due to issues (try to check if these are fixed in a release every so often)
  #
- 
  # Pin this until piwheels is building 1.9 (see https://www.piwheels.org/project/scipy/)
  scipy = "==1.8.1"
- 
  # Newer versions aren't builting yet (see https://www.piwheels.org/project/cryptography/)
  cryptography = "==38.0.1"
 +django-guardian = "*"
 +djangorestframework-guardian = "*"
 +
  # Locked version until https://github.com/django/channels_redis/issues/332
  # is resolved
  channels-redis = "==3.4.1"