changeset 712:1abc331099b7

Merge.
author Brian Neal <bgneal@gmail.com>
date Tue, 17 Sep 2013 18:23:28 -0500
parents c09ed90c891b (current diff) e1153e58162f (diff)
children 859620244c4a
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/requirements.txt	Tue Sep 17 18:17:28 2013 -0500
+++ b/requirements.txt	Tue Sep 17 18:23:28 2013 -0500
@@ -1,4 +1,4 @@
-Django==1.5.2
+Django==1.5.4
 Markdown==2.3.1
 MySQL-python==1.2.4
 -e git+https://github.com/gremmie/django-elsewhere.git@1203bd331aba4c5d4e702cc4e64d807310f2b591#egg=django_elsewhere-dev