utils.py
15.9 KB
-
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged · 21135416
Conflicts: .ruby-version cms/djangoapps/contentstore/tests/test_contentstore.py cms/djangoapps/models/settings/course_metadata.py common/lib/xmodule/xmodule/course_module.py common/lib/xmodule/xmodule/modulestore/tests/factories.py
Calen Pennington committed