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 /requirements.txt | |
| 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 'requirements.txt')
| -rw-r--r-- | requirements.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/requirements.txt b/requirements.txt index db34e4b6..cb27fd04 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ Flask>=0.9 Jinja2>=2.7 MarkupSafe>=0.18 -PIL>=1.1.7 +Pillow>=2.3.0,<2.4 Werkzeug>=0.8.3 lxml>=3.2.1 netlib>=0.9.2 |