Commit 5d4514d7 by Brittney Exline Committed by GitHub

Merge pull request #14099 from edx/release

Hotfix Dec-1-2016 and Release Dec-6-2016
parents dcfbfd5d 9e137b94
......@@ -217,7 +217,7 @@ Randy Ostler <rando305@gmail.com>
Thomas Young <thomas@upcoder.com>
Andrew Dekker <simultech@gmail.com>
Christopher Lee <clee@edx.org>
Mushtaq Ali <mushtaque.ali@arbisoft.com>
Mushtaq Ali <mushtaak@gmail.com>
Colin Fredericks <colin.fredericks@gmail.com>
Xiaolu Xiong <beardeer@gmail.com>
Tim Krones <t.krones@gmx.net>
......
......@@ -34,7 +34,7 @@ django-simple-history==1.6.3
django-statici18n==1.1.5
django-storages==1.4.1
django-method-override==0.1.0
django-user-tasks==0.1.1
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
......
......@@ -80,7 +80,7 @@ git+https://github.com/edx/edx-ora2.git@1.1.11#egg=ora2==1.1.11
-e git+https://github.com/edx/edx-submissions.git@1.1.1#egg=edx-submissions==1.1.1
git+https://github.com/edx/ease.git@release-2015-07-14#egg=ease==0.1.3
git+https://github.com/edx/i18n-tools.git@v0.3.2#egg=i18n-tools==v0.3.2
git+https://github.com/edx/edx-val.git@0.0.10#egg=edxval==0.0.10
git+https://github.com/edx/edx-val.git@0.0.10#egg=edxval==0.0.11
git+https://github.com/pmitros/RecommenderXBlock.git@v1.1#egg=recommender-xblock==1.1
git+https://github.com/solashirai/crowdsourcehinter.git@518605f0a95190949fe77bd39158450639e2e1dc#egg=crowdsourcehinter-xblock==0.1
-e git+https://github.com/pmitros/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment