Don Mitchell f48289cc4f Moved assetstore tests to own file and ddt'd across stores ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py

2014-10-27 10:04:10 -04:00

..

djangoapps

Merge branch 'release'

2014-10-23 19:41:31 +00:00

lib

Moved assetstore tests to own file and ddt'd across stores

2014-10-27 10:04:10 -04:00

static

Merge pull request #5667 from lduarte1991/lduarte-harvardx-pr33

2014-10-23 11:22:22 -04:00

templates

Merge pull request #5590 from cpennington/xblocks-with-children

2014-10-16 10:23:35 -04:00

test

Fix test page definition for course group configurations page

2014-10-24 14:30:31 -04:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

2013-05-16 12:39:48 -04:00

xml_cleanup.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00