Adam Palay cfeb76e67f Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py

2014-09-05 13:20:15 -04:00

..

djangoapps

Refrain from accessing country code if country is None

2014-09-05 10:58:18 -04:00

lib

Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts

2014-09-05 13:20:15 -04:00

static

Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts

2014-09-05 13:20:15 -04:00

templates

Implement forum cohort visibility labels correctly

2014-09-04 13:47:48 -04:00

test

Merge pull request #5091 from edx/ammar/fix-video-transcripts-test

2014-09-05 12:02:13 -04:00

.gitignore

…

xml_cleanup.py

…