Merge branch 'support/3.1.0' into support/3.1

Browse Source

# Conflicts:
#	setup/itopdesignformat.class.inc.php

...

This commit is contained in:

Pierre Goiffon

2023-09-14 16:54:28 +02:00

parent 44c189223e bdf0b4daa9

commit 993606f102

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