Don Mitchell 3c3a316f08 Make it branch agnostic ...

LMS-11210

Conflicts:
	common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py

2014-08-18 16:19:46 -04:00

..

djangoapps

Merge pull request #4853 from edx/christina/stud-2093

2014-08-15 12:55:34 -04:00

lib

Make it branch agnostic

2014-08-18 16:19:46 -04:00

static

Add a request-token to identify which xblock html was rendered as part of the current request

2014-08-15 11:04:52 -04:00

templates

Template changes for course track AB-test

2014-08-15 10:26:29 -04:00

test

Add ability to set staff lock from course outline

2014-08-16 15:58:42 -04:00

.gitignore

…

xml_cleanup.py

…