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

Browse Source

# Conflicts:
#	datamodels/2.x/itop-portal-base/portal/public/css/portal.css
#	datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig

...

This commit is contained in:

Molkobain

2023-11-24 16:45:04 +01:00

parent 484a0bb6b6 7b59df216b

commit 7e3e8e43a8

3 changed files with 106 additions and 641 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

739

datamodels/2.x/itop-portal-base/portal/public/css/portal.css

File diff suppressed because it is too large Load Diff