Fixup dev/master
I targeted my MRs to the dev branch. Now dev and master diverged...
- Let's merge master into dev (rather than the other way around, because the diff is smaller).
- Then let's fast-forward master to dev.
- Then let's remove dev again, it's too much hassle, let's stay on master again
😄
Edited by Thore Göbel