Merge pull request #966 from edx/yro_unpin-django

unpin django version

Merge pull request #966 from edx/yro_unpin-django
unpin django version
ba62a4c1 · Gregory Martin · GitHub · 1ed3fc69 · 0956d8b0 · ba62a4c1
Commit ba62a4c1 authored Jan 20, 2017 by Gregory Martin Committed by GitHub Jan 20, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletions

.gitignore
+2 -0

requirements/base.txt
+1 -1

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,5 @@ test/selenium/screenshots/*

 # logging
 logs/*.log*
+
+edx-ora2/
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -12,7 +12,7 @@ git+https://github.com/edx/edx-submissions.git@1.1.4#egg=edx-submissions==1.1.4
 boto>=2.32.1,<3.0.0
 celery==3.1.18
 defusedxml==0.4.1
-django>=1.8.14,<1.9
+django<1.9.0
 django-extensions==1.5.9
 django-model-utils==2.3.1
 djangorestframework>=3.1,<3.3