Andy Armstrong fe6668a550 Merge branch 'release' ...

Conflicts:
	common/lib/xmodule/xmodule/video_module/video_module.py
	requirements/edx/github.txt

2014-09-23 15:53:10 -04:00

..

djangoapps

Merge branch 'release'

2014-09-23 15:53:10 -04:00

lib

Merge branch 'release'

2014-09-23 15:53:10 -04:00

static

Merge pull request #5221 from edx/tim/sourcemaps-debug-only

2014-09-17 13:37:55 +03:00

templates

Prepare track selection page for new audit track

2014-09-12 13:58:13 -04:00

test

Merge branch 'release'

2014-09-23 15:53:10 -04:00

.gitignore

…

xml_cleanup.py

…