Rocky Duan 0b3e9909a4 Merge branch 'master' into refactor ...

Conflicts:
	lms/djangoapps/django_comment_client/tests.py
	lms/static/coffee/src/discussion/content.coffee
	requirements.txt

2012-08-20 15:35:31 -07:00

..

djangoapps

Merge branch 'master' of github.com:MITx/mitx into refactor

2012-08-20 15:31:51 -07:00

lib

Merge branch 'master' into refactor

2012-08-20 15:35:31 -07:00

static

Wiki circuit editors zoom to fit contents.

2012-08-18 00:10:42 -04:00

templates

Added MathJax to wiki pages.

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

test

Keep each course's descriptors separate

2012-08-20 09:26:16 -04:00

xml_cleanup.py

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

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