Merge branch 'master' into sanchez/template-first-crack

Conflicts: apps/openassessment/xblock/openassessmentblock.py

Merge branch 'master' into sanchez/template-first-crack
Conflicts: apps/openassessment/xblock/openassessmentblock.py
d9fcf7e7 · Stephen Sanchez · bb8fe156 · 8f08dce5 · d9fcf7e7 · d9fcf7e7
Commit d9fcf7e7 authored Feb 18, 2014 by Stephen Sanchez
Expand all Show whitespace changes
Inline Side-by-side

Showing with 120 additions and 14 deletions

apps/openassessment/xblock/openassessmentblock.py
+118 -12

requirements/base.txt
+2 -2

No files found.
--- a/apps/openassessment/xblock/openassessmentblock.py
+++ b/apps/openassessment/xblock/openassessmentblock.py
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -4,7 +4,7 @@ git+https://github.com/ormsbee/xblock-sdk.git@3c092c27#egg=xblock-sdk

 # Third Party Requirements
 django==1.4.8
-django-extensions==1.3.3
+django-extensions==1.2.5
 djangorestframework==2.3.5
 Mako==0.9.1
-pytz==2013.9
+pytz==2012h