Jean Manuel Nater 1b94050ef6 Merge branch 'master' into jnater/courseware_tests ...

Conflicts:
	lms/djangoapps/open_ended_grading/tests.py

2013-06-21 16:38:31 -04:00

..

__init__.py

Refactor existing grading logic into a new app.

2012-12-28 11:29:29 -05:00

open_ended_notifications.py

Comment touched modules

2013-05-07 15:48:19 -04:00

staff_grading_service.py

Clean up pep8 E128 issues

2013-06-20 09:08:25 -04:00

staff_grading.py

Remove unused imports from lms, as detected by pylint.

2013-06-19 16:56:34 -04:00

tests.py

Merge branch 'master' into jnater/courseware_tests

2013-06-21 16:38:31 -04:00

views.py

Remove unused imports from lms, as detected by pylint.

2013-06-19 16:56:34 -04:00