]> git.ipfire.org Git - thirdparty/paperless-ngx.git/commitdiff
projects / thirdparty / paperless-ngx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43ec058 c217759)
Merge branch 'dev' into feature-permissions
authorMichael Shamoon <4887959+shamoon@users.noreply.github.com>
Sat, 7 Jan 2023 02:04:00 +0000 (18:04 -0800)
committerMichael Shamoon <4887959+shamoon@users.noreply.github.com>
Sat, 7 Jan 2023 02:04:00 +0000 (18:04 -0800)
1  2 
Pipfile patch | diff1 | diff2 | blob | history
Pipfile.lock patch | diff1 | diff2 | blob | history

diff --cc Pipfile
Simple merge
diff --cc Pipfile.lock
Simple merge
Mirror of https://github.com/paperless-ngx/paperless-ngx.git