Calen Pennington 73d6565fac Merge remote-tracking branch 'origin/hotfix/1.0.1' ...

Conflicts:
	common/djangoapps/student/views.py

2012-07-26 09:05:57 -04:00

..

management

Cleaning up pep8 violations

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

migrations

Cleaning up pep8 violations

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

__init__.py

Move student app from lms to common

2012-07-13 11:51:32 -04:00

admin.py

Cleaning up pep8 violations

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

models.py

Cleaning up pep8 violations

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

tests.py

Move student app from lms to common

2012-07-13 11:51:32 -04:00

views.py

Merge remote-tracking branch 'origin/hotfix/1.0.1'

2012-07-26 09:05:57 -04:00