Merge branch '8.x' into 9.x

# Conflicts:
#	CHANGELOG.md
#	server.php
This commit is contained in:
Dries Vints 2022-04-29 15:51:16 +02:00
commit 17fbcaaa10
No known key found for this signature in database
GPG Key ID: E1529B3ACC4A5A76

Diff Content Not Available