Adam b6a5bea072 Merge pull request #5400 from edx/merge-conflicts-release ...

Merge conflicts release

2014-09-26 09:34:16 -04:00

..

djangoapps

Merge pull request #5386 from open-craft/fix-anonymous-ids-unicode

2014-09-25 16:43:18 -04:00

lib

Merge branch 'release'

2014-09-25 16:25:45 -04:00

static

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

2014-09-25 17:35:29 -04:00

templates

Prepare track selection page for new audit track

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

test

Merge pull request #5199 from edx/ned/remove-jsdraw

2014-09-25 23:03:50 -04:00

.gitignore

…

xml_cleanup.py

…