diff options
| author | Chris McDonough <chrism@plope.com> | 2014-05-05 23:48:51 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2014-05-05 23:48:51 -0400 |
| commit | 0caac0a0af78cd55df2e1f3c3c7fc5171dbfe849 (patch) | |
| tree | a624aa38b3db1f7de58bb8bf9aaff4583cec28fd /tox.ini | |
| parent | ba85e591d563ed654f492f7cab5ca492a32a86d7 (diff) | |
| parent | 0117573edbc5dff565868187f8841859b3e36a51 (diff) | |
| download | pyramid-0caac0a0af78cd55df2e1f3c3c7fc5171dbfe849.tar.gz pyramid-0caac0a0af78cd55df2e1f3c3c7fc5171dbfe849.tar.bz2 pyramid-0caac0a0af78cd55df2e1f3c3c7fc5171dbfe849.zip | |
Merge branch 'master' into redundant_totuorial_logging_config
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ [tox] envlist = - py26,py27,py32,py33,pypy,cover + py26,py27,py32,py33,py34,pypy,cover [testenv] commands = |