]> git.ipfire.org Git - thirdparty/paperless-ngx.git/commitdiff
Merge branch 'master' into dev
authorjonaswinkler <jonas.winkler@jpwinkler.de>
Sat, 6 Feb 2021 22:28:39 +0000 (23:28 +0100)
committerjonaswinkler <jonas.winkler@jpwinkler.de>
Sat, 6 Feb 2021 22:28:39 +0000 (23:28 +0100)
1  2 
README.md

diff --cc README.md
Simple merge