openedx/core/djangoapps/credit/tests · 58c7f43f6131773482c6c39ac0b3529cc0ffacb2 · edx / edx-platform · GitLab

History Find file

Merge remote-tracking branch 'origin/release' into merge-release-into-master · 104bcd51
```
Conflicts:
	common/djangoapps/student/views.py
	openedx/core/djangoapps/credit/tests/test_api.py
```
Will Daly committed Jul 07, 2015
104bcd51

Name	Last commit	Last update
..
__init__.py		Loading commit data...
test_api.py		Loading commit data...
test_models.py		Loading commit data...
test_signals.py		Loading commit data...
test_signature.py		Loading commit data...
test_tasks.py		Loading commit data...
test_views.py		Loading commit data...