Merge remote-tracking branch 'origin/support/2.7' into support/3.0

# Conflicts:
#	pages/preferences.php
This commit is contained in:
Eric Espie
2024-05-29 18:18:55 +02:00

Diff Content Not Available