diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2015-11-03 15:40:41 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2015-11-03 15:40:41 -0800 |
| commit | 6e443b75c8d3b0c6399ce2fbcf8a2cdb251dcaad (patch) | |
| tree | d217b247f29fe71738c69410ac7006ccccb33260 /tox.ini | |
| parent | d37c68673396b247c08d0d5122bb012e9c3c46c3 (diff) | |
| parent | 5e6dc69e783291a500631bac3c6b026b6b6d9baa (diff) | |
Merge branch '1.14' into 1.15
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions