diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-01-19 14:46:46 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-01-19 14:46:46 -0800 |
| commit | 4968eaf8c92c0b59037444dcd4ce08a71e203ec2 (patch) | |
| tree | 55fc99130c78131b8e911de482d8afe2084080b4 /tox.ini | |
| parent | a1fbc37779f9bb1ee152057e7110d5b1c77a863c (diff) | |
| parent | 1919014fa649d32dec4039f2b8c115233c082418 (diff) | |
Merge branch '1.13' into 1.14
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions