Closed PingWIN7 closed 6 years ago
It's tricky to pick apart the changes here, but in the future if we're more careful with branches we should getting into this icky situation.
I'm going to just merge this one in, then we can do an in-person code review going though it one pass instead of going by commit-at-a-time.
This pull request contains all the code from codetidying, master, and add some new testcases