test.py
6.77 KB
-
Merge commit '8325e28a' into edx-west/release · 9ae71a31
Conflicts: cms/djangoapps/contentstore/utils.py cms/templates/login.html cms/templates/widgets/header.html cms/templates/widgets/sock.html lms/envs/test.py
Jason Bau committed