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

Browse Source

# Conflicts:
#	application/displayblock.class.inc.php

...

This commit is contained in:

acognet

2023-04-25 15:14:22 +02:00

parent d6e5069dd5 3c94974d9d

commit 7e7f8577e8

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