diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2015-09-30 15:44:08 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2015-09-30 15:44:08 -0700 |
commit | ff7c400d3d54f233fb5fe82d7233bc2f93f5aab4 (patch) | |
tree | 60495d398e5b8a8b65d5447c79ed97a46e6df2e7 /tox.ini | |
parent | c0f1da60bd7da55bf7a2051a329192c1c018f099 (diff) | |
parent | 8bf03014128b074bf6988100f18e48a94671cca2 (diff) |
Merge branch '1.15'
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions