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 | 511f64fd78c66c9b94c85065adf3aaf597dbf799 (patch) | |
| tree | 1159072dea6bd59c67cb3b206834abf005b25dd4 /tox.ini | |
| parent | 98862baf47163dbe839623ec14b72013f53c7ae5 (diff) | |
| parent | 0390eebb828ac52a8fe07d7279a4d534c8d0a04f (diff) | |
Merge branch '1.17' into 2.0
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions