module_render.py
4.76 KB
-
Merge branch 'master' into anonymous_user · 5011f60d
Conflicts: djangoapps/courseware/module_render.py djangoapps/courseware/modules/capa_module.py
Calen Pennington committed
Conflicts: djangoapps/courseware/module_render.py djangoapps/courseware/modules/capa_module.py