Merge branch 'dev' into feature-permissions

diff --cc Pipfile
index 3dd4cde3bcbe8371fec1f4957886023a7a154c48,09065956bc95d62446c2e52c2e0b533600011954..2684ef2dabce05688eaaa663c9744ad88f1e842d
--- 1/Pipfile
--- 2/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"

diff --cc Pipfile.lock
Simple merge

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