Merge branch 'coloquinte_rebase' into devel

Browse Source

Some merge conflicts did occurs as it seems the latests commits
from "devel" where not applied to the rebase.

...

This commit is contained in:

Jean-Paul Chaput 2023-07-09 13:42:21 +02:00

parent 3243b12abb 21deed93f1

commit d258749373

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available