_courseware.scss
4.03 KB
-
Merge branch 'master' into feature/bk_forum_int · eb96497c
Conflicts: lms/djangoapps/courseware/views.py lms/templates/courseware/courseware.html requirements.txt
David Ormsbee committed
Conflicts: lms/djangoapps/courseware/views.py lms/templates/courseware/courseware.html requirements.txt