Merge branch 'master' of https://github.com/theodor-franke/BookStack into theodor...

author Dan Brown <redacted>

Thu, 21 Oct 2021 13:04:23 +0000 (14:04 +0100)

committer Dan Brown <redacted>

Thu, 21 Oct 2021 13:04:23 +0000 (14:04 +0100)
author Dan Brown <redacted>
Thu, 21 Oct 2021 13:04:23 +0000 (14:04 +0100)
committer Dan Brown <redacted>
Thu, 21 Oct 2021 13:04:23 +0000 (14:04 +0100)
diff --cc .env.example.complete
Simple merge
diff --cc app/Auth/Access/Saml2Service.php
Simple merge
author	Dan Brown <redacted>
	Thu, 21 Oct 2021 13:04:23 +0000 (14:04 +0100)
committer	Dan Brown <redacted>
	Thu, 21 Oct 2021 13:04:23 +0000 (14:04 +0100)
		1	2
.env.example.complete	patch \|	diff1 \|	diff2 \|	blob \| history
app/Auth/Access/Saml2Service.php	patch \|	diff1 \|	diff2 \|	blob \| history