Merge remote-tracking branch 'origin/develop' into feature/4157

Browse Source

# Conflicts:
#	application/ui.linkswidget.class.inc.php
#	core/dbobject.class.php

...

This commit is contained in:

acognet

2022-09-29 17:49:10 +02:00

parent c7eea3f51f f32f36fc74

commit 2363f2fb21

1206 changed files with 80990 additions and 39417 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

853

core/dbobject.class.php

File diff suppressed because it is too large Load Diff