Closed vext01 closed 4 years ago
This syncs us with upstream.
There's one extra merge than usual because I started the sync before the last PR was merged, and rebasing these sync-ups never works (you get wacky conflicts along the upstream history).
I'll point out one part of this change in a moment.
May I squash?
Go ahead.
Splat.
bors r+
Build succeeded:
This syncs us with upstream.
There's one extra merge than usual because I started the sync before the last PR was merged, and rebasing these sync-ups never works (you get wacky conflicts along the upstream history).
I'll point out one part of this change in a moment.