Bridger Maxwell bde93aea99 Merge remote-tracking branch 'origin/master' into template_caching ...

Conflicts:
	lms/templates/footer.html
	lms/templates/signup_modal.html

2012-07-16 16:19:26 -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 template_caching

2012-07-16 16:19:26 -04:00