Merge 10.4 into 10.5

Browse Source

This fixes up 4eb8e51c269eb9447d3765a6e4deba0dc68dfa37
which missed a second parent.

...

This commit is contained in:

Marko Mäkelä 2022-12-01 11:04:58 +02:00

parent 4eb8e51c26 07a06022c4

commit 7487c313bc

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