common/test/acceptance/pages · ad16f9f968fd2a0d8a144759c88d8d45d60e38d2 · 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
..
common		Loading commit data...
lms		Loading commit data...
studio		Loading commit data...
xblock		Loading commit data...
__init__.py		Loading commit data...