diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2015-09-30 14:53:09 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2015-09-30 14:53:09 -0700 |
commit | c0f1da60bd7da55bf7a2051a329192c1c018f099 (patch) | |
tree | 86927ac72ee1adef71db6f68fae2d028d1d59953 /tox.ini | |
parent | e520165eeec1b7c2d165ab611f7947b6c8d4da0f (diff) | |
parent | 57106d04def84ca1d9dd23c4d85b2ba9242556ff (diff) |
Merge branch '1.15'
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions