Rocky Duan fd0eff46e7 Merge branch 'feature/rocky/discussion_api_key' into refactor ...

Conflicts:
	lms/djangoapps/django_comment_client/tests.py
	lms/lib/comment_client/utils.py
	lms/templates/courseware/courseware.html

2012-08-21 17:14:25 -07:00

..

djangoapps

Merge pull request #448 from MITx/feature/ichuang/add-gitreload-to-migrate

2012-08-21 12:52:52 -07:00

lib

comment out debug messages

2012-08-21 16:09:48 -04:00

static

updated backbone & single thread retrieval now working

2012-08-20 22:03:46 -07:00

templates

Added MathJax to wiki pages.

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

test

add a course to test start dates

2012-08-21 16:21:01 -04:00

xml_cleanup.py

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

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