Bridger Maxwell 68ab19730f Merge remote-tracking branch 'origin/master' into feature/bridger/course_grading ...

Conflicts:
	lms/djangoapps/courseware/views.py

2012-09-20 17:42:31 -04:00

..

djangoapps

Remove unused 'module' parameter from replace_{static,course}_urls

2012-09-20 01:12:33 -04:00

lib

Merge remote-tracking branch 'origin/master' into feature/bridger/course_grading

2012-09-20 17:42:31 -04:00

static

Merge branch 'master' into feature/arjun/new-discussions

2012-09-14 15:15:21 -07:00

templates

Added MathJax to wiki pages.

2012-08-18 13:12:04 -04:00

test

Removed accidental symlink.

2012-09-20 17:41:02 -04:00

xml_cleanup.py

{} -> {0} etc in .format statements

2012-08-16 16:22:26 -04:00