Calen Pennington d8f8d8c656 Merge branch 'release/1.0' ...

Conflicts:
	common/djangoapps/student/views.py
	lms/djangoapps/courseware/courses.py

2012-07-24 08:52:50 -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 branch 'release/1.0'

2012-07-24 08:52:50 -04:00