Merge pull request #4276 from edx/db/update-pillow

Update pillow to 2.6.1

Merge pull request #4276 from edx/db/update-pillow
Update pillow to 2.6.1
4f823396 · David Baumgold · fbc48d5e · f7938310 · 4f823396 · 4f823396
Commit 4f823396 authored Dec 11, 2014 by David Baumgold
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

docs/shared/requirements.txt
+1 -1

requirements/edx/base.txt
+1 -1

No files found.
--- a/docs/shared/requirements.txt
+++ b/docs/shared/requirements.txt
@@ -43,7 +43,7 @@ nltk==2.0.4
 oauthlib==0.6.3
 paramiko==1.9.0
 path.py==3.0.1
-Pillow==1.7.8
+Pillow==2.6.1
 pip>=1.3
 polib==1.0.3
 pycrypto>=2.6

--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -56,7 +56,7 @@ nose==1.3.3
 oauthlib==0.6.3
 paramiko==1.9.0
 path.py==3.0.1
-Pillow==1.7.8
+Pillow==2.6.1
 pip>=1.4
 polib==1.0.3
 pycrypto>=2.6