Christine Lytwynec 96e5139d66 Merge branch 'release' ...

Conflicts:
	common/lib/xmodule/xmodule/tests/test_video.py

2014-06-25 13:51:31 -04:00

..

djangoapps

Redirect Chinese students to a Chinese CDN for video.

2014-06-24 18:39:52 +03:00

lib

Merge branch 'release'

2014-06-25 13:51:31 -04:00

static

Merge pull request #4170 from lduarte1991/lduarte-harvardx-pr6

2014-06-23 10:24:53 -04:00

templates

Revise course mode choose page.

2014-06-16 14:08:40 -04:00

test

Merge pull request #3999 from edx/christina/updating-split-test

2014-06-20 14:15:41 -04:00

.gitignore

…

xml_cleanup.py

…