course_index.html
248 Bytes
-
Merge remote-tracking branch 'origin/master' into ps-cms-backbone · 6d246f06
Conflicts: cms/djangoapps/contentstore/views.py cms/static/coffee/unit.coffee cms/templates/index.html cms/templates/widgets/sequence-edit.html
Calen Pennington committed