diff options
author | Maximilian Hils <git@maximilianhils.com> | 2014-03-08 15:47:27 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2014-03-08 15:47:27 +0100 |
commit | 2b01c4eee7a52dfb5fd30bb9b248cec87d563db9 (patch) | |
tree | 72604de5152bdf15147a78e03a669a207baeac95 /setup.py | |
parent | 3032672f10c727623ee085d04d623901dac856df (diff) | |
parent | 221973aff6553ffb1d40859c5d35b88d959f9718 (diff) | |
download | mitmproxy-2b01c4eee7a52dfb5fd30bb9b248cec87d563db9.tar.gz mitmproxy-2b01c4eee7a52dfb5fd30bb9b248cec87d563db9.tar.bz2 mitmproxy-2b01c4eee7a52dfb5fd30bb9b248cec87d563db9.zip |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -102,7 +102,7 @@ setup( "netlib>=%s"%version.VERSION, "urwid>=1.1", "pyasn1>0.1.2", - "pyopenssl>=0.13", + "pyopenssl>=0.14", "Pillow>=2.3.0", "lxml", "flask" |