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

Fix gradebook when using grade cutoffs other than A/B/C

2013-04-16 11:38:58 -04:00

test_download_csv.py

Addressed pull request feedback.

2013-06-21 14:05:57 -04:00

test_enrollment.py

Merge branch 'master' into jnater/courseware_tests

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

test_forum_admin.py

Addressed pull request feedback.

2013-06-21 14:05:57 -04:00

test_gradebook.py

Remove unused imports from lms, as detected by pylint.

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

test_xss.py

Remove unused imports from lms, as detected by pylint.

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