John Jarvis dabcb51746 resolving merge conflicts

2013-02-19 12:43:06 -05:00

..

management

Pep8 autofixes

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

migrations

Pep8 autofixes

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

__init__.py

Move student app from lms to common

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

admin.py

add offline grade computation & DB table for this

2013-01-10 23:32:48 -05:00

models.py

Pep8 autofixes

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

tests.py

Pep8 autofixes

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

views.py

resolving merge conflicts

2013-02-19 12:43:06 -05:00