course_metadata.py
3.31 KB
-
Merge branch 'bug/dhm/date-parse' of github.com:MITx/mitx into bug/dhm/date-parse · 884019b1
Conflicts: cms/djangoapps/models/settings/course_metadata.py cms/urls.py
Don Mitchell committed
Conflicts: cms/djangoapps/models/settings/course_metadata.py cms/urls.py