Merge branch 'refs/heads/support/3.1' into support/3.2

Browse Source

# Conflicts:
#	pages/ajax.render.php

...

This commit is contained in:

jf-cbd

2024-04-19 11:27:32 +02:00

parent 9d195d6fa0 1164e757de

commit 6ff60080a1

1 changed files with 2278 additions and 2176 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

676

pages/ajax.render.php

File diff suppressed because it is too large Load Diff