Calen Pennington 31a070d480 Merge remote-tracking branch 'edx/release' into merge-release-2014-03-10 ...

Conflicts:
	cms/envs/common.py
	lms/envs/common.py

2014-03-10 16:21:08 -04:00

..

djangoapps

Merge pull request #2832 from edx/gprice/create-account-lang-pref

2014-03-10 15:13:15 -04:00

lib

Merge remote-tracking branch 'edx/release' into merge-release-2014-03-10

2014-03-10 16:21:08 -04: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

When creating a course in studio set a unique wiki_slug for it.

2014-03-10 16:13:18 +05:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

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

xml_cleanup.py

…