Nimisha Asthagiri 4c717ee35d Merge pull request #4236 from edx/nimisha/fix_ms_merge_conflict_heartbeat ...

Fix modulestore merge conflict with heartbeat.

2014-06-27 22:26:30 -04:00

..

djangoapps

Merge pull request #4236 from edx/nimisha/fix_ms_merge_conflict_heartbeat

2014-06-27 22:26:30 -04:00

lib

Fix modulestore merge conflict with heartbeat.

2014-06-27 13:57:33 -04:00

static

Update the discussion area broken span tags

2014-06-26 12:55:12 +05:00

templates

Revise course mode choose page.

2014-06-16 14:08:40 -04:00

test

Display names, help text, and "deprecated" for Advanced Settings.

2014-06-26 16:54:22 -04:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

2013-05-16 12:39:48 -04:00

xml_cleanup.py

…