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

Browse Source

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

...

This commit is contained in:

Pierre Goiffon

2023-07-11 11:59:09 +02:00

parent 2dce37f289 5247f5b3ea

commit be1c559ad4

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