Calen Pennington 77b895cb98 Merge pull request #3673 from cpennington/opaque-keys-merge-master ...

Merge master into opaque-keys

2014-05-15 13:24:50 -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 pull request #3673 from cpennington/opaque-keys-merge-master

2014-05-15 13:24:50 -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

…

xml_cleanup.py

…