Merge branch 'master' into profile
Conflicts: lms/djangoapps/django_comment_client/forum/views.py lms/templates/course_navigation.html
Showing
Please
register
or
sign in
to comment
Conflicts: lms/djangoapps/django_comment_client/forum/views.py lms/templates/course_navigation.html