_content.mustache
3.3 KB
-
Merge remote-tracking branch 'rocky/master' into feature/dave/forum_fixes · aeee2791
Conflicts: lms/lib/comment_client/utils.py lms/templates/discussion/mustache/_content.mustache
David Ormsbee committed
Conflicts: lms/lib/comment_client/utils.py lms/templates/discussion/mustache/_content.mustache