]> git.ipfire.org Git - thirdparty/paperless-ngx.git/commit
fix merge conflict 957/head
authorMichael Shamoon <4887959+shamoon@users.noreply.github.com>
Wed, 1 Jun 2022 16:28:26 +0000 (09:28 -0700)
committerMichael Shamoon <4887959+shamoon@users.noreply.github.com>
Wed, 1 Jun 2022 16:28:26 +0000 (09:28 -0700)
commit97bbca3aef463ba81808883c9570139735b7635e
tree3e6c3d280f228e82edb40934fff3b25d0c8a3aa3
parent9eee37bc686f0769bfa16fae32943d76e21a1073
fix merge conflict
src-ui/src/app/components/document-detail/document-detail.component.ts
src-ui/src/app/pipes/custom-date.pipe.ts