Merge remote-tracking branch 'croizat/vbm-combatmodule'
authorLiza Carvelli <liza@carvel.li>
Sat, 21 Dec 2024 14:04:51 +0000 (15:04 +0100)
committerLiza Carvelli <liza@carvel.li>
Sat, 21 Dec 2024 14:04:51 +0000 (15:04 +0100)

Trivial merge