summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-23 00:18:30 -0400
committerChris McDonough <chrism@plope.com>2011-09-23 00:18:30 -0400
commitf7b9be3fea04b9bdaf65e52b0baafa406bcaf1c0 (patch)
tree35d690dbf7be911bd6f9065a02d52f657d28fbed
parent07ee180bf7561f7a6330c91b6d4833f55328b8f3 (diff)
parent10b4f1c76c13df070224fa6b298b013d03ccddbc (diff)
downloadpyramid-f7b9be3fea04b9bdaf65e52b0baafa406bcaf1c0.tar.gz
pyramid-f7b9be3fea04b9bdaf65e52b0baafa406bcaf1c0.tar.bz2
pyramid-f7b9be3fea04b9bdaf65e52b0baafa406bcaf1c0.zip
Merge branch 'py3' of github.com:Pylons/pyramid into py3
-rw-r--r--tox.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 40711a5f2..58980e805 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
envlist =
- py25,py26,py27,jython,pypy,cover
+ py26,py27,jython,pypy,cover
[testenv]
commands =