Merge branch 'dev' into feature-permissions

diff --cc Pipfile
index dcbd6a611e4e3595850470d588ab310cb051e65d,58307af2de2969dd1858b71e273be69e2d9bc57b..e0f6d736f2da1eab2e52ddab7fc8ad987791f0e8
--- 1/Pipfile
--- 2/Pipfile
+++ b/Pipfile
@@@ -61,11 -56,21 +56,23 @@@ nltk = "*
  pdf2image = "*"
  flower = "*"
  bleach = "*"
- # https://www.piwheels.org/project/cryptography/ last built version
+ 
+ #
+ # 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"
+ 
  [dev-packages]
  coveralls = "*"
  factory-boy = "*"

diff --cc Pipfile.lock
Simple merge

diff --cc src/paperless/settings.py
Simple merge