Merge remote-tracking branch 'origin/release' into merge-release-into-master

2016-04-07 12:02:43 -04:00
parent c7552db4d5 3853538c5a
commit 76f0fb0fc2
11 changed files with 411 additions and 182 deletions
--- a/common/djangoapps/course_modes/models.py
+++ b/common/djangoapps/course_modes/models.py
@@ -398,7 +398,7 @@ class CourseMode(models.Model):

    @classmethod
    def has_verified_mode(cls, course_mode_dict):
-        """Check whether the modes for a course allow a student to pursue a verfied certificate.
+        """Check whether the modes for a course allow a student to pursue a verified certificate.

        Args:
            course_mode_dict (dictionary mapping course mode slugs to Modes)