Calen Pennington 240fcc1d5a Fix merge conflicts

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

..

djangoapps

Fix merge conflicts

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

lib

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

2014-05-22 10:52:00 -04:00

static

Using Edx version of tinymce

2014-05-16 14:02:25 -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

2014-05-22 10:52:00 -04:00

.gitignore

…

xml_cleanup.py

…