Merge remote-tracking branch 'remotes/origin/release' into release-2015-10-01-resolve-merge-conflicts

2015-10-01 15:28:55 -04:00
parent 42c02c8036 54ede57c15
commit 69bc10235e
4 changed files with 2 additions and 108 deletions
--- a/lms/djangoapps/courseware/tests/test_module_render.py
+++ b/lms/djangoapps/courseware/tests/test_module_render.py
@@ -729,7 +729,7 @@ class TestProctoringRendering(ModuleStoreTestCase):
            {
                'status': 'eligible',
                'short_description': 'Ungraded Practice Exam',
-                'suggested_icon': 'fa-pencil-square-o',
+                'suggested_icon': '',
                'in_completed_state': False
            }
        ),