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

# Conflicts:
#	css/setup.css
#	setup/setuppage.class.inc.php
This commit is contained in:
Molkobain
2024-03-21 14:59:27 +01:00
4 changed files with 127 additions and 2 deletions

File diff suppressed because one or more lines are too long