Merge remote-tracking branch 'origin/release' into releases/2023-12-13

Browse Source

this handles the hotfix introduced conflict.

...

This commit is contained in:

Joonas Koivunen

2023-12-13 10:07:19 +00:00

parent 8460654f61 a46e77b476

commit 079d3a37ba

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