]> git.ipfire.org Git - thirdparty/paperless-ngx.git/commit
Fix merge conflict 1641/head
authorMichael Shamoon <4887959+shamoon@users.noreply.github.com>
Mon, 10 Oct 2022 06:24:36 +0000 (23:24 -0700)
committerMichael Shamoon <4887959+shamoon@users.noreply.github.com>
Mon, 10 Oct 2022 06:24:36 +0000 (23:24 -0700)
commit3b07e0fe1568e83d8e2e4aaadc3abb641db79ae3
treee4bf613f78bfbf2f9885bdcb38fc7bc54ae887f6
parenta246b3b59830a8a4c328ae819667487cf0b1a46c
Fix merge conflict
src-ui/src/app/components/manage/settings/settings.component.ts