changeset 145:a9b333d3ed69

Merge.
author Brian Neal <bgneal@gmail.com>
date Sat, 17 May 2014 12:35:32 -0500
parents 71967932fb28 (current diff) 6afbb2c77416 (diff)
children 676aa93a0f14
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/requirements_dev.txt	Sat May 17 12:34:55 2014 -0500
+++ b/requirements_dev.txt	Sat May 17 12:35:32 2014 -0500
@@ -1,11 +1,11 @@
-Django==1.6.2
+Django==1.6.5
 MySQL-python==1.2.5
 argparse==1.2.1
 python-memcached==1.48
 wsgiref==0.1.2
 django-localflavor==1.0
 docutils==0.11
-Pillow==2.2.2
+Pillow==2.4.0
 Fabric==1.4.3
 pycrypto==2.6.1
 ssh==1.8.0