diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2015-11-03 15:39:28 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2015-11-03 15:39:28 -0800 |
| commit | 5e6dc69e783291a500631bac3c6b026b6b6d9baa (patch) | |
| tree | c0b9d4b91b631a9923d6bf7fef513331971a13ff /tox.ini | |
| parent | 79bdefe35610b651566bb7422518fb60b3f72bdd (diff) | |
| parent | 3a5227c477295c8e14e395d3ac66e9a58db0ebc8 (diff) | |
Merge branch '1.13' into 1.14
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions