Will Daly 458186f7d1 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form ...

Conflicts:
	lms/djangoapps/student_account/test/test_views.py
	lms/djangoapps/student_account/urls.py
	lms/djangoapps/student_account/views.py

2014-10-20 10:57:05 -04:00

..

__init__.py

Add Django apps for student account and profile.

2014-09-25 08:36:22 -04:00

account.py

Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form

2014-10-20 10:57:05 -04:00

course_tag.py

Move user_service into user_api/api

2014-10-14 07:38:10 -04:00

profile.py

Fix broken profile API test

2014-10-16 10:24:00 -04:00