diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2015-09-30 14:32:07 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2015-09-30 14:32:07 -0700 |
| commit | e520165eeec1b7c2d165ab611f7947b6c8d4da0f (patch) | |
| tree | c8850718276b91933a47919b8ee82e08bcd7564d /tox.ini | |
| parent | 977c237d711b27b10ee29f960c270c80956cc291 (diff) | |
| parent | 0e9b78539da392170dd09d629bcfaef9cf724bc1 (diff) | |
Merge branch '1.15'
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions