clytwynec 6396373bd5 Merge pull request #3758 from edx/clytwynec/disable-XBlockAcidNoChildTest ...

disabled test_lms.py:XBlockAcidNoChildTest.test_acid_block

2014-05-16 12:01:05 -04:00

..

djangoapps

Revert pull request #3466

2014-05-14 13:55:26 -04:00

lib

Merge branch 'release' (after release-2014-05-14).

2014-05-15 14:34:22 -04:00

static

Revert pull request #3466

2014-05-14 13:55:26 -04:00

templates

Implement editing from the Studio container page.

2014-04-09 10:32:11 -04:00

test

Merge pull request #3758 from edx/clytwynec/disable-XBlockAcidNoChildTest

2014-05-16 12:01:05 -04:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

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

xml_cleanup.py

…