Merge branch 'ivir-authncontext' of https://github.com/ivir/BookStack into ivir-ivir...

author Dan Brown <redacted>

Sat, 8 May 2021 11:13:27 +0000 (12:13 +0100)

committer Dan Brown <redacted>

Sat, 8 May 2021 11:13:27 +0000 (12:13 +0100)
author Dan Brown <redacted>
Sat, 8 May 2021 11:13:27 +0000 (12:13 +0100)
committer Dan Brown <redacted>
Sat, 8 May 2021 11:13:27 +0000 (12:13 +0100)
diff --cc .env.example.complete
Simple merge
diff --cc app/Config/saml2.php
Simple merge
author	Dan Brown <redacted>
	Sat, 8 May 2021 11:13:27 +0000 (12:13 +0100)
committer	Dan Brown <redacted>
	Sat, 8 May 2021 11:13:27 +0000 (12:13 +0100)
		1	2
.env.example.complete	patch \|	diff1 \|	diff2 \|	blob \| history
app/Config/saml2.php	patch \|	diff1 \|	diff2 \|	blob \| history