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

Browse Source

# Conflicts:
#	application/itopwebpage.class.inc.php

...

This commit is contained in:

Molkobain

2021-03-23 16:48:14 +01:00

parent 2834c2f86c 9af4846372

commit cf5dffcd80

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