]> git.ipfire.org Git - thirdparty/paperless-ngx.git/commitdiff
Merge branch 'dev' into feature-consume-eml
authorphail <phail@hacknology.de>
Fri, 20 May 2022 17:29:52 +0000 (19:29 +0200)
committerphail <phail@hacknology.de>
Fri, 20 May 2022 17:29:52 +0000 (19:29 +0200)
1  2 
Pipfile
docker/compose/docker-compose.postgres-tika.yml
docker/compose/docker-compose.sqlite-tika.yml
docs/configuration.rst
docs/troubleshooting.rst

diff --cc Pipfile
Simple merge
Simple merge
Simple merge