content.coffee
13.9 KB
-
Merge branch 'brittany' of github.com:dementrock/mitx into profile & · 70059426
small fix Conflicts: lms/templates/discussion/user_profile.html
Rocky Duan committed
small fix Conflicts: lms/templates/discussion/user_profile.html