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

..

__init__.py

Basic first commit of Photo ID Verification model and test code

2013-08-21 16:21:52 -04:00

0001_initial.py

Merge branch 'ormsbee/verifyuser' into ormsbee/verifyuser_func

2013-08-22 14:07:08 -04:00