Calen Pennington 29f7fe14fb Merge remote-tracking branch 'edx/master' into ok-merge-from-master

2014-05-23 10:05:56 -04:00

..

djangoapps

Fix merge conflicts

2014-05-22 16:24:02 -04:00

lib

Merge remote-tracking branch 'edx/master' into ok-merge-from-master

2014-05-23 10:05:56 -04:00

static

Addressed review feedback.

2014-05-22 10:40:31 -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 ok-merge-from-master

2014-05-23 10:05:56 -04:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

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

xml_cleanup.py

…