summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-04-07 09:55:11 -0400
committerChris McDonough <chrism@plope.com>2014-04-07 09:55:11 -0400
commitbcf18220be9c21ff4b1af50f45b90aadfa7820f5 (patch)
tree99232b448c08c5689117cb84c025efb349b50b0f /tox.ini
parentd7b647d27ebde9bc8203629b651e69d6e7ac7c38 (diff)
parent32200c3af84c352c066eb2c402496305375912e4 (diff)
downloadpyramid-bcf18220be9c21ff4b1af50f45b90aadfa7820f5.tar.gz
pyramid-bcf18220be9c21ff4b1af50f45b90aadfa7820f5.tar.bz2
pyramid-bcf18220be9c21ff4b1af50f45b90aadfa7820f5.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index b50e56544..2bf213ca4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
envlist =
- py26,py27,py32,py33,pypy,cover
+ py26,py27,py32,py33,py34,pypy,cover
[testenv]
commands =