activation_active.html
1.01 KB
-
Merge branch 'master' into talbs/studio-authorship · 6629d5d3
Conflicts: cms/djangoapps/contentstore/views/user.py cms/static/sass/elements/_controls.scss cms/templates/activation_active.html cms/templates/activation_complete.html cms/templates/activation_invalid.html
cahrens committed