Merge branch 'dev'

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

Fri, 17 Feb 2023 04:07:50 +0000 (20:07 -0800)

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

Fri, 17 Feb 2023 04:07:50 +0000 (20:07 -0800)
author shamoon <4887959+shamoon@users.noreply.github.com>
Fri, 17 Feb 2023 04:07:50 +0000 (20:07 -0800)
committer shamoon <4887959+shamoon@users.noreply.github.com>
Fri, 17 Feb 2023 04:07:50 +0000 (20:07 -0800)
diff --cc docker/compose/docker-compose.mariadb-tika.yml
Simple merge
diff --cc docker/compose/docker-compose.postgres-tika.yml
Simple merge
diff --cc docker/compose/docker-compose.sqlite-tika.yml
Simple merge
diff --cc docs/configuration.md
Simple merge
author	shamoon <4887959+shamoon@users.noreply.github.com>
	Fri, 17 Feb 2023 04:07:50 +0000 (20:07 -0800)
committer	shamoon <4887959+shamoon@users.noreply.github.com>
	Fri, 17 Feb 2023 04:07:50 +0000 (20:07 -0800)
		1	2
docker/compose/docker-compose.mariadb-tika.yml	patch \|	diff1 \|	diff2 \|	blob \| history
docker/compose/docker-compose.postgres-tika.yml	patch \|	diff1 \|	diff2 \|	blob \| history
docker/compose/docker-compose.sqlite-tika.yml	patch \|	diff1 \|	diff2 \|	blob \| history
docs/configuration.md	patch \|	diff1 \|	diff2 \|	blob \| history