Merge branch 'support/3.2' into develop

Browse Source

# Conflicts:
#	css/setup.css
#	datamodels/2.x/itop-portal-base/portal/public/css/portal.css
#	package-lock.json

...

This commit is contained in:

Stephen Abello

2026-04-29 16:58:50 +02:00

parent ea35ad48d2 de4ec9d9ce

commit 8de5c2525b

179 changed files with 7748 additions and 303 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

14

css/setup.css

File diff suppressed because one or more lines are too long