diff options
| author | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2017-08-15 16:53:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-15 16:53:59 +0200 |
| commit | 92ab90bb89cb3a31ea1ba4cf6bd3912922693957 (patch) | |
| tree | ff97e496c13ce9d48270cd6c6e52f75594bddc86 | |
| parent | 38237f8a0f79e125d36e271abdf778a0e4379e0c (diff) | |
| parent | 68839077b6e93af9ac6d7c6894751e41d715c9b2 (diff) | |
| download | mitmproxy-92ab90bb89cb3a31ea1ba4cf6bd3912922693957.tar.gz mitmproxy-92ab90bb89cb3a31ea1ba4cf6bd3912922693957.tar.bz2 mitmproxy-92ab90bb89cb3a31ea1ba4cf6bd3912922693957.zip | |
Merge pull request #2527 from mitmproxy/revert-2511-master
Revert "Fix version conflict"
| -rw-r--r-- | setup.py | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -69,7 +69,6 @@ setup( "h2>=3.0, <4", "html2text>=2016.1.8, <=2016.9.19", "hyperframe>=5.0, <6", - "idna==2.5", # till newer version of requests is released "jsbeautifier>=1.6.3, <1.7", "kaitaistruct>=0.7, <0.8", "ldap3>=2.2.0, <2.4", |