Merge branch 'ormsbee/verifyuser' into ormsbee/verifyuser_func
Conflicts: lms/djangoapps/verify_student/models.py lms/djangoapps/verify_student/tests/test_models.py lms/djangoapps/verify_student/tests/test_views.py lms/djangoapps/verify_student/urls.py lms/djangoapps/verify_student/views.py lms/envs/dev.py lms/templates/verify_student/face_upload.html lms/templates/verify_student/photo_id_upload.html lms/urls.py
Showing
common/templates/course_modes/choose.html
0 → 100644
lms/static/sass/elements/_typography.scss
0 → 100644
lms/static/sass/views/_verification.scss
0 → 100644
Please
register
or
sign in
to comment