Chris Dodge 5a25d7fa6e Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/dangling-discussion-modules ...

Conflicts:
	lms/djangoapps/django_comment_client/utils.py

2013-02-06 14:05:56 -05:00

..

branding

Allow for branding subdomains that are longer than a single .

2012-10-11 13:18:27 -04:00

certificates

Pep8 autofixes

2013-02-06 11:13:50 -05:00

circuit

Cleaning up pep8 violations

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

course_wiki

Pep8 autofixes

2013-02-06 11:13:50 -05:00

courseware

Pep8 autofixes

2013-02-06 11:13:50 -05:00

dashboard

Pep8 autofixes

2013-02-06 11:13:50 -05:00

django_comment_client

Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/dangling-discussion-modules

2013-02-06 14:05:56 -05:00

instructor

Pep8 autofixes

2013-02-06 11:13:50 -05:00

licenses

Pep8 autofixes

2013-02-06 11:13:50 -05:00

lms_migration

Pep8 autofixes

2013-02-06 11:13:50 -05:00

multicourse

Cleaning up pep8 violations

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

open_ended_grading

Pep8 autofixes

2013-02-06 11:13:50 -05:00

portal

Pep8 autofixes

2013-02-06 11:13:50 -05:00

psychometrics

Pep8 autofixes

2013-02-06 11:13:50 -05:00

simplewiki

Pep8 autofixes

2013-02-06 11:13:50 -05:00

static_template_view

Pep8 autofixes

2013-02-06 11:13:50 -05:00

staticbook

Pep8 autofixes

2013-02-06 11:13:50 -05:00

terrain

Pep8 autofixes

2013-02-06 11:13:50 -05:00