diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-05-05 22:11:38 -0400 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-05-05 22:11:38 -0400 |
| commit | a89af1ac7bf090a42f63b9b40ee1d074b8c0adac (patch) | |
| tree | 582baa3094e7d662f2b19c40be4e756afbba19b5 /tox.ini | |
| parent | 23dee7e520ae1a0fcf1d3fab2626d36819d5c0ee (diff) | |
| parent | e667f0a8af5717d82671c406fc55621f4010301e (diff) | |
| download | pyopenssl-a89af1ac7bf090a42f63b9b40ee1d074b8c0adac.tar.gz | |
Merge branch 'deprecate32' of github.com:elitest/pyopenssl into deprecate32
Conflicts:
.travis.yml
setup.py
tox.ini
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,5 +1,5 @@ [tox] -envlist = {pypy,py26,py27,py33,py34}{,-cryptographyMaster},pypi-readme,check-manifest +envlist = {pypy,py26,py33,py34}{,-cryptographyMaster},pypi-readme,check-manifest [testenv] deps = |