John Jarvis 7023eb4c19 resolving merge conflicts

2014-07-21 13:42:06 -04:00

..

djangoapps

resolving merge conflicts

2014-07-21 13:42:06 -04:00

lib

resolving merge conflicts

2014-07-21 13:42:06 -04:00

static

Fix anonymous posts appear are labeled with the logged in user's role

2014-07-14 17:01:23 +05:00

templates

Revise course mode choose page.

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

test

ignore MAC meta files on import and also remove any such files from the course

2014-07-21 13:16:00 +05:00

.gitignore

…

xml_cleanup.py

…