diff options
author | Sandor Nemes <snemes@users.noreply.github.com> | 2016-01-17 21:24:47 +0100 |
---|---|---|
committer | Sandor Nemes <snemes@users.noreply.github.com> | 2016-01-17 21:24:47 +0100 |
commit | 192f0339674d1b276a0866eddcebb9c93036ae2b (patch) | |
tree | bbf4faa75bb330d7d013e17d54f6e5b33ffcbb78 /setup.py | |
parent | 2753af0ec72e542d5a4dc3e5e200bd1638b2b095 (diff) | |
parent | 0f54f2990c0a32960ec5c82c620f79c68ad5f4b6 (diff) | |
download | mitmproxy-192f0339674d1b276a0866eddcebb9c93036ae2b.tar.gz mitmproxy-192f0339674d1b276a0866eddcebb9c93036ae2b.tar.bz2 mitmproxy-192f0339674d1b276a0866eddcebb9c93036ae2b.zip |
Merge branch 'master' into master
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -26,7 +26,7 @@ deps = { "construct>=2.5.2, <2.6", "six>=1.10.0, <1.11", "lxml==3.4.4", # there are no Windows wheels for newer versions, so we pin this. - "Pillow>=3.0.0, <3.1", + "Pillow>=3.0.0, <3.2", "watchdog>=0.8.3, <0.9", } # A script -> additional dependencies dict. |