Merge branch 1.0.X into 1.1.X.

mozilla · Aug 6, 2012 · 87c10ce · 87c10ce
2 parents 2409449 + 7d38172
commit 87c10ce
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/requirements/dist b/requirements/dist
diff --git a/requirements/pure.txt b/requirements/pure.txt
@@ -1,5 +1,5 @@
 # Pure python dependencies.
-Django==1.3.1
+Django==1.3.3
 
 South==0.7.3.hg1008
 django_compressor==1.1.2

diff --git a/requirements/vendor b/requirements/vendor