Merge branch 'phallstrom/option-no-color'v1.13.0
commitb442b9bdced7d849ddc0ea4283de1f80d9bacd8c
authorAnish Athalye <me@anishathalye.com>
Tue, 9 Oct 2018 04:02:41 +0000 (8 21:02 -0700)
committerAnish Athalye <me@anishathalye.com>
Tue, 9 Oct 2018 04:02:41 +0000 (8 21:02 -0700)
tree8e69dbce24fb7510d04e631ebcb25c1e0bd38b86
parentf197ededb11e7613aa0f4c5f88311e9ab4653749
parenta22d980cdfc31718e28b5ba00b135e4396698660
Merge branch 'phallstrom/option-no-color'