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

Browse Source

# Conflicts:
#	core/log.class.inc.php

...

This commit is contained in:

Benjamin Dalsass

2022-06-08 13:05:50 +02:00

parent f014ebfeb1 220b384479

commit a0c78a94c6

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

Diff Content Not Available