Merge branch 'dev' into feature-permissions

diff --cc Pipfile.lock
Simple merge

diff --cc src-ui/src/app/components/document-detail/document-detail.component.html
Simple merge

diff --cc src-ui/src/app/components/document-detail/document-detail.component.ts
Simple merge

diff --cc src/documents/tasks.py
Simple merge

diff --cc src/documents/tests/test_api.py
Simple merge

diff --cc src/documents/tests/test_management_exporter.py
Simple merge

diff --cc src/documents/views.py
index fd0949fc10ad9e5b9323d67df003395e47ba5575,6f0be216423b0aada4a789d6bfdbad2be71ace07..1bb5a50f083fc475d9e923e299d911daa5c1bdfa
--- 1/src/documents/views.py
--- 2/src/documents/views.py
+++ b/src/documents/views.py
@@@ -29,10 -30,8 +31,11 @@@ from django.utils.translation import ge
  from django.views.decorators.cache import cache_control
  from django.views.generic import TemplateView
  from django_filters.rest_framework import DjangoFilterBackend
 +from documents.filters import ObjectOwnedOrGrandtedPermissionsFilter
 +from documents.permissions import PaperlessAdminPermissions
 +from documents.permissions import PaperlessObjectPermissions
  from documents.tasks import consume_file
+ from langdetect import detect
  from packaging import version as packaging_version
  from paperless import version
  from paperless.db import GnuPG

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

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

diff --cc src/paperless_mail/mail.py
Simple merge