Conflicts: common/djangoapps/student/views.py openedx/core/djangoapps/credit/tests/test_api.py
common ------ This directory contains common code shared between LMS and CMS, such as Mako templates, CSS, and Coffescript.
Conflicts: common/djangoapps/student/views.py openedx/core/djangoapps/credit/tests/test_api.py
common ------ This directory contains common code shared between LMS and CMS, such as Mako templates, CSS, and Coffescript.