diff options
author | Aldo Cortesi <aldo@corte.si> | 2016-12-24 11:20:12 +1300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-24 11:20:12 +1300 |
commit | 5167d59d63e8f70770119a26804feaad17fccb8f (patch) | |
tree | 8d31230fb601d7da87ee5d9da46a0a554c12b0ed /setup.py | |
parent | 9f1cbe8746df6096e877b2cc57d386ff08f079d8 (diff) | |
parent | 24751965f99daf83c82d9c1581f712ca24da9d3d (diff) | |
download | mitmproxy-5167d59d63e8f70770119a26804feaad17fccb8f.tar.gz mitmproxy-5167d59d63e8f70770119a26804feaad17fccb8f.tar.bz2 mitmproxy-5167d59d63e8f70770119a26804feaad17fccb8f.zip |
Merge branch 'master' into admin
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -67,7 +67,7 @@ setup( "cryptography>=1.3, <1.8", "cssutils>=1.0.1, <1.1", "Flask>=0.10.1, <0.12", - "h2>=2.5.0, <3", + "h2>=2.5.1, <3", "html2text>=2016.1.8, <=2016.9.19", "hyperframe>=4.0.1, <5", "jsbeautifier>=1.6.3, <1.7", |