Chris Dodge 0a839d9f01 Merge branch 'master' of github.com:edx/edx-platform

2014-04-14 14:17:49 -04:00

..

djangoapps

Merge pull request #3203 from mlkwaqas/waqas/lms2479-fixed-userlazy-object-change-name

2014-04-14 17:55:26 +05:00

lib

Merge branch 'master' of github.com:edx/edx-platform

2014-04-14 14:17:49 -04:00

static

Merge branch 'release'

2014-04-14 14:17:03 -04:00

templates

Implement editing from the Studio container page.

2014-04-09 10:32:11 -04:00

test

in Studio, render compact placeholders for inline discussions.

2014-04-10 15:44:30 -04:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

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

xml_cleanup.py

…