Merge pull request #95 from edx/feanil/update_django

Update django to latest security patch.
openedx · May 13, 2015 · 44cf785 · 44cf785
2 parents 0347fea + 97f1a3b
commit 44cf785
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pre-requirements.txt b/pre-requirements.txt
@@ -1 +1 @@
-setuptools==14.3.1
+setuptools==15.2
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-Django==1.4.13
+django==1.4.20
 MySQL-python==1.2.5
 South==0.7.6
 argparse==1.2.1