From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 18 Apr 2021 10:41:52 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: ng-1.4.1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17b9d7eb4293ffd7f6d376e15bc78c8cee9a91d2;p=thirdparty%2Fpaperless-ngx.git

Merge branch 'master' into dev
---

17b9d7eb4293ffd7f6d376e15bc78c8cee9a91d2