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

Browse Source

# Conflicts:
#	core/config.class.inc.php
#	setup/setuputils.class.inc.php

...

This commit is contained in:

Molkobain

2022-09-20 13:27:20 +02:00

parent 4aad555649 e55ac6002a

commit 31454b2946

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available