@Chris, as Cody already mentioned, Tom's branch has been merged. The differences are small... only 2 files with small conflicts, but not entirely obvious on how to resolve.
@Chris, as Cody already mentioned, Tom's branch has been merged. The differences are small... only 2 files with small conflicts, but not entirely obvious on how to resolve.