Merge pull request #14115 from edx/bmedx/django-1.8.17

PLAT1122 - Upgrade Django to 1.8.17

Merge pull request #14115 from edx/bmedx/django-1.8.17
PLAT1122 - Upgrade Django to 1.8.17
cc91ec7d · Brian Mesick · GitHub · da6303ad · 3376089e · cc91ec7d
Commit cc91ec7d authored Dec 12, 2016 by Brian Mesick Committed by GitHub Dec 12, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

AUTHORS
+1 -0

requirements/edx/base.txt
+1 -1

No files found.
--- a/AUTHORS
+++ b/AUTHORS
@@ -277,3 +277,4 @@ Albert St. Aubin Jr. <astaubin@edx.org>
 Casey Litton <caseylitton@gmail.com>
 Jhony Avella <jhony.avella@edunext.co>
 Tanmay Mohapatra <tanmaykm@gmail.com>
+Brian Mesick <bmesick@edx.org>
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -38,7 +38,7 @@ django-user-tasks==0.1.2
 # We need a fix to DRF 3.2.x, for now use it from our own cherry-picked repo
 #djangorestframework>=3.1,<3.2
 git+https://github.com/edx/django-rest-framework.git@3c72cb5ee5baebc4328947371195eae2077197b0#egg=djangorestframework==3.2.3
-django==1.8.16
+django==1.8.17
 djangorestframework-jwt==1.8.0
 djangorestframework-oauth==1.1.0
 edx-ccx-keys==0.2.1