Nimisha Asthagiri d7f850a764 Merge branch 'release' ...

Conflicts:
	lms/djangoapps/instructor/features/data_download.py

2014-10-07 16:23:28 -04:00

..

djangoapps

Merge branch 'release'

2014-10-07 16:23:28 -04:00

lib

Merge branch 'release'

2014-10-07 16:23:28 -04:00

static

Merge branch 'release'

2014-10-07 16:23:28 -04:00

templates

Remove extraneous dollar sign in template

2014-10-02 23:28:17 +05:00

test

Merge branch 'release'

2014-10-07 16:23:28 -04:00

.gitignore

…

xml_cleanup.py

…