lms/djangoapps · 575ff02f8aedbd9993d80a080db8d62a9381d82b · edx / edx-platform · GitLab

History Find file

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into… · 575ff02f

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4

Conflicts:
	jenkins/test.sh

committed Jan 18, 2013

Name	Last commit	Last update
..
branding		Loading commit data...
certificates		Loading commit data...
circuit		Loading commit data...
course_wiki		Loading commit data...
courseware		Loading commit data...
dashboard		Loading commit data...
django_comment_client		Loading commit data...
instructor		Loading commit data...
licenses		Loading commit data...
lms_migration		Loading commit data...
multicourse		Loading commit data...
open_ended_grading		Loading commit data...
portal		Loading commit data...
psychometrics		Loading commit data...
simplewiki		Loading commit data...
static_template_view		Loading commit data...
staticbook		Loading commit data...
terrain		Loading commit data...