Calen Pennington ebe67d2d7d Merge remote-tracking branch 'origin/release/1.0' ...

Conflicts:
	common/djangoapps/student/views.py

2012-07-23 13:55:20 -04:00

..

management

Added import/export scripts

2012-07-20 16:39:19 -04:00

migrations

Remove migration that conflicts with smooth_registration

2012-07-22 18:01:44 -04:00

__init__.py

Move student app from lms to common

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

admin.py

Move student app from lms to common

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

models.py

Fix up the signup modal for registration for the new fields.

2012-07-22 18:53:12 -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/release/1.0'

2012-07-23 13:55:20 -04:00