common/lib/xmodule · c97314413bc046878e08a557e323c02c48a3539c · edx / edx-platform · GitLab

History Find file

Merge branch 'release' into release-merge-test · c9731441
```
Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py
```
Max Rothman committed Jul 17, 2015
c9731441

Name	Last commit	Last update
..
test_files		Loading commit data...
xmodule		Loading commit data...
setup.py		Loading commit data...