Merge branch 'develop' into feature/faf-cke-mentions

Browse Source

# Conflicts:
#	application/cmdbabstract.class.inc.php
#	css/css-variables.scss
#	css/light-grey.scss
#	datamodels/2.x/installation.xml

...

This commit is contained in:

Molkobain

2020-12-09 19:58:26 +01:00

parent 08449b7af5 b8a42843e0

commit 68332896ad

4411 changed files with 193489 additions and 195956 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

722

core/dbobject.class.php

File diff suppressed because it is too large Load Diff