diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-04-01 11:13:28 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-04-01 11:13:28 -0700 |
| commit | cb6c4bec5d1f71347992ec7509c054fb5508c123 (patch) | |
| tree | 0b75157e92c13164e4881010a07a2c00e62cf64c /tox.ini | |
| parent | 619b24738a4aef12917c906b7773638b730ffaa5 (diff) | |
| parent | e65b6270213f8e961372c52352d64eeb691d1487 (diff) | |
Merge branch '1.11' into 1.12
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions