diff options
| author | Vincent Driessen <vincent@3rdcloud.com> | 2014-05-06 15:52:35 +0200 |
|---|---|---|
| committer | Vincent Driessen <vincent@3rdcloud.com> | 2014-05-06 15:52:35 +0200 |
| commit | c5939479b5cb6be34c8dbc01103e099d02629ad4 (patch) | |
| tree | 54bf362b4aea8619abfe70cd2856de924d6f1784 /tox.ini | |
| parent | 1f423436a5e7cf11ca397edf65aa7cfc70c588c6 (diff) | |
| parent | ab9e6b852e527482234aafcba857d7d85f90ca01 (diff) | |
| download | rq-c5939479b5cb6be34c8dbc01103e099d02629ad4.tar.gz | |
Merge remote-tracking branch 'origin/master' into SanyerMyasoedov-master
Conflicts:
rq/decorators.py
tests/__init__.py
tests/test_decorator.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,py33,pypy +envlist=py26,py27,py33,py34,pypy [testenv] commands=py.test [] |