summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-03-27 22:02:50 -0500
committerMichael Merickel <michael@merickel.org>2014-03-27 22:02:50 -0500
commitf6d16adba1212aeb34e288a460ef87118661b40c (patch)
tree527977b2c6af35ea0812d21be3a3daee041b4435
parent6fadce6b810276522fc420e0ec10fe40fd607538 (diff)
parent0a2ea908f35f245b1c4750d8d97ffe645ce29a57 (diff)
downloadpyramid-f6d16adba1212aeb34e288a460ef87118661b40c.tar.gz
pyramid-f6d16adba1212aeb34e288a460ef87118661b40c.tar.bz2
pyramid-f6d16adba1212aeb34e288a460ef87118661b40c.zip
Merge pull request #1188 from msabramo/patch-4
tox.ini: Add py34
-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 =