diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-01-05 11:15:27 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-01-05 11:15:27 +1300 |
| commit | 8a599be0602382e0ea5ffbc4018db07b0f379ae7 (patch) | |
| tree | e8bfab41aec5ef0293b2690e9dd5a3a5ac79d748 /setup.py | |
| parent | ac31039ad3c5a7f808065cab426d3d9aeab0004c (diff) | |
| parent | 1fa6bcbd5ab5e51f9e4250024c848933ea0911e7 (diff) | |
| download | mitmproxy-8a599be0602382e0ea5ffbc4018db07b0f379ae7.tar.gz mitmproxy-8a599be0602382e0ea5ffbc4018db07b0f379ae7.tar.bz2 mitmproxy-8a599be0602382e0ea5ffbc4018db07b0f379ae7.zip | |
Merge branch 'migrate_from_pil_to_pillow' of https://github.com/Kami/mitmproxy into Kami-migrate_from_pil_to_pillow
Conflicts:
requirements.txt
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -97,7 +97,7 @@ setup( "urwid>=1.1", "pyasn1>0.1.2", "pyopenssl>=0.13", - "PIL", + "Pillow>=2.3.0,<2.4", "lxml", "flask" ], |