David Ormsbee
4a70f7588e
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
2013-08-22 14:07:08 -04:00
..
2013-08-22 14:07:08 -04:00
2013-08-22 13:56:23 -04:00
2013-07-29 23:33:50 -04:00
2013-08-22 14:07:08 -04:00
2013-08-22 14:07:08 -04:00
2013-02-20 09:31:50 -05:00
2013-08-15 22:56:32 -04:00
2013-08-21 16:21:53 -04:00
2013-06-19 00:48:18 -07:00
2013-07-16 14:33:58 -04:00