Adam Palay 76fc180cd9 Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	common/lib/xmodule/xmodule/css/capa/display.scss

2015-09-01 16:01:04 -04:00

..

common

Revert "Decorated instructor dashboard with sudo_required."

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

lms

Merge remote-tracking branch 'origin/release' into merge-release-into-master

2015-09-01 16:01:04 -04:00

studio

Merge pull request #9402 from edx/clytwynec/TNL-2153

2015-09-01 12:48:46 -04: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