Merge branch 'development' into lukeshu/oidc-development

author Dan Brown <redacted>

Tue, 16 Apr 2024 13:57:36 +0000 (14:57 +0100)

committer Dan Brown <redacted>

Tue, 16 Apr 2024 13:57:36 +0000 (14:57 +0100)
author Dan Brown <redacted>
Tue, 16 Apr 2024 13:57:36 +0000 (14:57 +0100)
committer Dan Brown <redacted>
Tue, 16 Apr 2024 13:57:36 +0000 (14:57 +0100)
diff --cc app/Access/Oidc/OidcService.php
Simple merge
diff --cc tests/Auth/OidcTest.php
Simple merge
author	Dan Brown <redacted>
	Tue, 16 Apr 2024 13:57:36 +0000 (14:57 +0100)
committer	Dan Brown <redacted>
	Tue, 16 Apr 2024 13:57:36 +0000 (14:57 +0100)
		1	2
app/Access/Oidc/OidcService.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Auth/OidcTest.php	patch \|	diff1 \|	diff2 \|	blob \| history