Don Mitchell 3885e6cf78 Merge branch 'release' ...

Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html

2014-01-16 12:51:22 -05:00

..

features

…

management

…

migrations

…

mock_lti_server

…

tests

Merge branch 'release'

2014-01-16 12:51:22 -05:00

__init__.py

…

access.py

Moved roles.py to common student

2014-01-14 17:04:43 -05:00

admin.py

…

courses.py

…

grades.py

…

masquerade.py

…

model_data.py

…

models.py

…

module_render.py

…

progress.py

…

tabs.py

…

urls.py

…

views.py

…