Bridger Maxwell 2f4cf23b73 Merge remote-tracking branch 'origin/master' into course_start ...

Conflicts:
	common/djangoapps/student/views.py

2012-07-17 12:53:27 -04:00

..

management

Move student app from lms to common

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

migrations

Move student app from lms to common

2012-07-13 11:51:32 -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

Move student app from lms to common

2012-07-13 11:51:32 -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/master' into course_start

2012-07-17 12:53:27 -04:00