Merge pull request #296 from edx/ned/django-1-4-11

Use Django 1.4.x

Merge pull request #296 from edx/ned/django-1-4-11
Use Django 1.4.x
2522b381 · Ned Batchelder · 994cf3db · 1c67a8b5 · 2522b381 · 2522b381
Commit 2522b381 authored Apr 24, 2014 by Ned Batchelder
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

AUTHORS
+2 -2

requirements/base.txt
+1 -1

No files found.
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,4 +5,5 @@ Feanil Patel <feanil@edx.org>
 David Ormsbee <dave@edx.org>
 Brian Talbot <btalbot@edx.org>
 Mark Hoeber <hoeber@edx.org>
-Sylvia Pearce <spearce@edx.org>
\ No newline at end of file
+Sylvia Pearce <spearce@edx.org>
+Ned Batchelder <ned@edx.org>
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -5,7 +5,7 @@ git+https://github.com/edx/xblock-sdk.git@643900aadcb18aaeb7fe67271ca9dbf36e463e
 # Third Party Requirements
 defusedxml==0.4.1
 dogapi==1.2.1
-django==1.4.8
+django>=1.4,<1.5
 django-extensions==1.2.5
 django-model-utils==1.4.0
 djangorestframework==2.3.5