test_views.py
48.5 KB
-
Merge remote-tracking branch 'origin/release' into merge-release-into-master · 9b3841f6
Conflicts: lms/djangoapps/teams/views.py lms/templates/courseware/progress.html
Adam Palay committed
Conflicts: lms/djangoapps/teams/views.py lms/templates/courseware/progress.html