changeset 787:7e17b9e45356

Merge.
author Brian Neal <bgneal@gmail.com>
date Sat, 17 May 2014 12:17:14 -0500
parents aa7c97d93a85 (diff) 85880b0df024 (current diff)
children 84aa49497718
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/requirements.txt	Sat May 17 12:10:09 2014 -0500
+++ b/requirements.txt	Sat May 17 12:17:14 2014 -0500
@@ -1,4 +1,4 @@
-Django==1.6.2
+Django==1.6.5
 Markdown==2.3.1
 MySQL-python==1.2.4
 -e git+https://github.com/gremmie/django-elsewhere.git@1203bd331aba4c5d4e702cc4e64d807310f2b591#egg=django_elsewhere-dev
@@ -25,7 +25,7 @@
 argparse==1.2.1
 six==1.4.1
 ftfy==2.0.1
-Pillow==2.1.0
+Pillow==2.4.0
 boto==2.13.0
 billiard==3.3.0.13
 #