Calen Pennington 85ca7db7a6 Fix merge conflicts relative to master

2014-05-12 11:42:21 -04:00

..

djangoapps

Fix merge conflicts relative to master

2014-05-12 11:42:21 -04:00

lib

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

2014-05-12 11:35:03 -04:00

static

Merge pull request #3466 from lduarte1991/lduarte-harvardx

2014-05-09 16:14:42 -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-09 15:29:32 -04:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

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

xml_cleanup.py

…