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

..

common

Revert "Decorated instructor dashboard with sudo_required."

2015-07-17 12:11:38 -04:00

lms

Merge branch 'release' into release-merge-test

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

studio

ziafazal/SOL-1021: Capture additional certificate configuration events

2015-07-14 11:12:09 +05:00

xblock

Enable parent/child tests using the acid XBlock.

2014-10-16 09:08:54 -04:00

__init__.py

Updated bok choy page objects setup.py

2014-02-04 14:32:42 -05:00