Max Rothman c97314413b Merge branch 'release' into release-merge-test ...

Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py

2015-07-17 17:42:03 -04:00

..

acceptance

Merge branch 'release' into release-merge-test

2015-07-17 17:42:03 -04:00

data

…

db_cache

…

db_fixtures

ziafazal/SOL-980: Generate certificates from instructor dashboard

2015-07-02 14:32:36 -04:00

templates

…

test_microsites

…

__init__.py

…