Merge remote-tracking branch 'origin/support/3.0.0-beta2' into develop

Browse Source

# Conflicts:
#	datamodels/2.x/itop-structure/precompiled-themes/fullmoon/main.css
#	datamodels/2.x/itop-structure/precompiled-themes/test-red/main.css

...

This commit is contained in:

Molkobain

2021-07-07 14:57:24 +02:00

parent bd67b71f3d f9064084f9

commit b5f5780f35

231 changed files with 151 additions and 239 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

9

datamodels/2.x/itop-structure/precompiled-themes/test-red/main.css

File diff suppressed because one or more lines are too long