Calen Pennington ff026ea8af Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master ...

Conflicts:
	common/lib/xmodule/xmodule/video_module/video_handlers.py

2014-05-15 10:25:08 -04:00

..

djangoapps

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

2014-05-14 10:00:25 -04:00

lib

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

2014-05-15 10:25:08 -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-13 15:30:56 -04:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

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

xml_cleanup.py

…