Chris Dodge 7229a9cdaf perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

..

management

Comments, whitespace from review.

2012-11-07 19:28:22 -05:00

migrations

Batch together alter statements to minimize how long we lock the auth_users table

2012-11-15 14:55:21 -05: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

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

tests.py

move unique_id_for_user into student/models.py

2012-11-17 16:33:00 -05:00

views.py

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00