Merge branch 'dev' into fix-merge-apps

author shamoon <4887959+shamoon@users.noreply.github.com>

Wed, 9 Apr 2025 22:51:53 +0000 (15:51 -0700)

committer shamoon <4887959+shamoon@users.noreply.github.com>

Wed, 9 Apr 2025 22:51:53 +0000 (15:51 -0700)
author shamoon <4887959+shamoon@users.noreply.github.com>
Wed, 9 Apr 2025 22:51:53 +0000 (15:51 -0700)
committer shamoon <4887959+shamoon@users.noreply.github.com>
Wed, 9 Apr 2025 22:51:53 +0000 (15:51 -0700)
diff --cc Dockerfile
Simple merge
diff --cc pyproject.toml
Simple merge
diff --cc src/paperless/settings.py
Simple merge
diff --cc src/paperless/signals/handlers.py
Simple merge
author	shamoon <4887959+shamoon@users.noreply.github.com>
	Wed, 9 Apr 2025 22:51:53 +0000 (15:51 -0700)
committer	shamoon <4887959+shamoon@users.noreply.github.com>
	Wed, 9 Apr 2025 22:51:53 +0000 (15:51 -0700)
		1	2
Dockerfile	patch \|	diff1 \|	diff2 \|	blob \| history
pyproject.toml	patch \|	diff1 \|	diff2 \|	blob \| history
src/paperless/settings.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/paperless/signals/handlers.py	patch \|	diff1 \|	diff2 \|	blob \| history