I'll let Bryce do the final review here.
But it looks good to me now. And more importantly, whoever reviews, the web UI shows conflict but actually there are none whilst using git :)
« Back to merge proposal
I'll let Bryce do the final review here.
But it looks good to me now. And more importantly, whoever reviews, the web UI shows conflict but actually there are none whilst using git :)