diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 11:08:16 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 11:08:16 -0700 |
| commit | f40b6027a82a97234f692ddd066c552807ba1d13 (patch) | |
| tree | 77ad28b70c0f86128b5637c482d431ca2d18e8a1 /tox.ini | |
| parent | 163caabf5e4a2a63216c2192dc476d4184ab81b3 (diff) | |
| parent | aa940f857f0995e9b191c79ff23651f1f58dc170 (diff) | |
Merge branch 'master' into 374-int
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 |