diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 11:26:59 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 11:26:59 -0700 |
| commit | 7ab97439c5a90f9ab55f489719229a6cdcf85310 (patch) | |
| tree | f556256a346670431ab87e357ba8ed22ebe17b66 /tox.ini | |
| parent | 49ae00822c910f62462fd881b1161bb8178b637d (diff) | |
| parent | a0f854d17fc59f0279d4d2b07d3fd810dfb1894e (diff) | |
Merge branch 'master' into 373-int
Conflicts:
paramiko/channel.py
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,5 +1,5 @@ [tox] -envlist = py26,py27,py32,py33 +envlist = py26,py27,py32,py33,py34 [testenv] commands = pip install --use-mirrors -q -r tox-requirements.txt |