common/djangoapps/user_api/tests · cb7d6b3970f7753b37fc7ed32b334fbd8a6944d9 · edx / edx-platform · GitLab

History Find file

Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form · a5001bab
```
Conflicts:
	lms/static/sass/base/_grid-settings.scss
	lms/static/sass/shared/_footer.scss
	lms/static/sass/shared/_header.scss
```
Will Daly committed Nov 13, 2014
a5001bab

Name	Last commit	Last update
..
__init__.py		Loading commit data...
factories.py		Loading commit data...
test_account_api.py		Loading commit data...
test_constants.py		Loading commit data...
test_course_tag_api.py		Loading commit data...
test_helpers.py		Loading commit data...
test_middleware.py		Loading commit data...
test_models.py		Loading commit data...
test_profile_api.py		Loading commit data...
test_views.py		Loading commit data...