summaryrefslogtreecommitdiff
path: root/requirements.txt
diff options
context:
space:
mode:
authorParabola <dev@list.parabolagnulinux.org>2011-03-06 14:13:36 +0000
committerParabola <dev@list.parabolagnulinux.org>2011-03-06 14:13:36 +0000
commit3ee286527f1ec23ead2c11201b9fa504a5bf6208 (patch)
tree8a9f605f751126c884139a6b3baa2835684ed22b /requirements.txt
parent2c2614c48957c32334aa9ba317db935a979cd67f (diff)
parentfee4c20e9607ccc479c33b2476fa1ba709efe607 (diff)
Merge branch 'master' of /srv/git/projects/parabolaweb
Conflicts: .gitignore
Diffstat (limited to 'requirements.txt')
-rw-r--r--requirements.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/requirements.txt b/requirements.txt
index ba21a59a..0a746d96 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Django==1.2.4
+Django==1.2.5
Markdown==2.0.3
South==0.7.3
pytz>=2010o