diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 15:01:18 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 15:03:12 -0700 |
| commit | 68f7dbea29bb700caf5885ffe8af6bc7bd5ad92b (patch) | |
| tree | 3fbee6b5c76ca2a38cb3abf527f6643a3cd6957c /tox.ini | |
| parent | 021160d8db62b8873f7deda3f7d89750941d2704 (diff) | |
| parent | 88d932f2bbab907879639122969fb1f763258d29 (diff) | |
Merge branch 'master' into 362-int
Conflicts:
tests/test_client.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 |