views.py
8.19 KB
-
Merge branch 'master' into anonymous_user · de21041c
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