Han Su Kim bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved ...

Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt

2014-03-06 16:56:16 -05:00

..

djangoapps

Merge remote-tracking branch 'origin/master' into release, conflicts resolved

2014-03-06 16:56:16 -05:00

lib

Merge remote-tracking branch 'origin/master' into release, conflicts resolved

2014-03-06 16:56:16 -05:00

static

Merge remote-tracking branch 'origin/master' into release, conflicts resolved

2014-03-06 16:56:16 -05:00

templates

Improved sequence navigation accessibility

2014-02-10 14:34:28 -05:00

test

Merge remote-tracking branch 'origin/master' into release, conflicts resolved

2014-03-06 16:56:16 -05:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

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

xml_cleanup.py

…