Closed WalrusSoup closed 4 years ago
Fixes issues that we had with #14 auto-merging
I'm manually bringing in the other changes as the auto-merge seriously messed up some stuff happening :)
Fixes issues that we had with #14 auto-merging