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

Browse Source

# Conflicts:
#	tests/php-unit-tests/post-build-integration-tests/SetupCssIntegrityChecklistTest.php
#	tests/php-unit-tests/unitary-tests/core/CMDBSource/CMDBSourceTest.php

...

This commit is contained in:

Pierre Goiffon

2024-01-03 10:41:12 +01:00

parent f84e2060be 94c604a6af

commit 6042e7f74d

6 changed files with 128 additions and 57 deletions

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

11

css/setup.css

File diff suppressed because one or more lines are too long