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

Browse Source

# Conflicts:
#	pages/ajax.render.php

...

This commit is contained in:

Pierre Goiffon

2020-12-03 18:18:36 +01:00

parent 4aaa237bf9 b9ca2ac13d

commit 3cf16627c1

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