Calen Pennington d4280e8529 Fix merge conflicts

2014-05-16 14:10:50 -04:00

..

djangoapps

Fix merge conflicts

2014-05-16 14:10:50 -04:00

lib

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-16 14:01:20 -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 remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-16 14:01:20 -04:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

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

xml_cleanup.py

…