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

..

data

Fix an issue with cache being cleared for bok_choy fast test

2014-01-31 14:33:24 -05:00

discussion

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

Merge pull request #8940 from edx/zoldak/SOL-1053-skip

2015-07-17 12:12:34 -04:00

video

move bok choy video license tests to shard_2

2015-06-08 15:51:13 -04:00

__init__.py

Quiet stevedore.extension logging in bok-choy tests

2014-10-01 12:14:51 -04:00

helpers.py

Revert "Decorated instructor dashboard with sudo_required."

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

test_annotatable.py

Eliminate instances of unused-import Pylint violation

2015-07-13 17:33:25 -04:00

test_cohorted_courseware.py

Revert "Decorated instructor dashboard with sudo_required."

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

test_ora.py

Fix PEP8: E128 continuation line under-indented

2014-11-24 20:46:50 -05:00