Merge branch 'release-4.3'

Browse Source

Use the `-s ours` merge strategy because this update to `release-4.3`
makes changes we only want in 4.3 and not `master`.

...

This commit is contained in:

Brad King committed 2026-02-27 11:22:46 -05:00

2 parents 8f09b95037 fd1184f735

commit efcf846d2e

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