diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-07-25 21:06:51 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-07-25 21:06:51 -0700 |
| commit | 0390eebb828ac52a8fe07d7279a4d534c8d0a04f (patch) | |
| tree | 0b98e1b45265629d4288708c4009963265975088 /tox.ini | |
| parent | 60878f34c11002bdedb2b5e96ef5836425e8adc3 (diff) | |
| parent | 59a69222b447b0f7562ce411523c97aba270e686 (diff) | |
Merge branch '1.16' into 1.17
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions