diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2017-08-10 14:42:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-10 14:42:08 +0200 |
| commit | b7c02b9eb53c2df0851c119a3be61ee137cbba4e (patch) | |
| tree | 80ee4ef33c5643a40a3d8510735785cb686427e2 | |
| parent | bb0ab45348933e46248a06baf00bdb1bd4f4b382 (diff) | |
| parent | 35c267b9bfc386e24858af2299be5d9289717421 (diff) | |
| download | mitmproxy-b7c02b9eb53c2df0851c119a3be61ee137cbba4e.tar.gz mitmproxy-b7c02b9eb53c2df0851c119a3be61ee137cbba4e.tar.bz2 mitmproxy-b7c02b9eb53c2df0851c119a3be61ee137cbba4e.zip | |
Merge pull request #2511 from ujjwal96/master
Fix version conflict
| -rw-r--r-- | setup.py | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -69,6 +69,7 @@ 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", |