Rocky Duan 7c58fd27a1 Merge branch 'master' of github.com:MITx/mitx ...

Conflicts:
	lms/templates/profile.html

2012-08-04 18:07:27 -04:00

..

certificates

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

circuit

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

courseware

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

2012-08-04 18:07:27 -04:00

dashboard

Pass the cursor, rather than the output of cursor.execute, to dictfetchall

2012-08-01 16:19:29 -04:00

django_comment_client

minor changes

2012-08-04 16:06:15 -04:00

heartbeat

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

multicourse

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

simplewiki

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

static_template_view

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

staticbook

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00