Closed maclyn closed 9 years ago
Fairly self-explanatory.
You need to rebase this on top of master and fix merge conflicts.
I think I've rebased now, so it should be able to automatically merge now.
:+1:
Okay, this should work.
Fairly self-explanatory.