crowdsource_hinter.py
12.7 KB
-
Merge branch 'felix/hinter2' of https://github.com/edx/edx-platform into felix/hinter2 · 596e1ead
Conflicts: common/lib/xmodule/xmodule/crowdsource_hinter.py
Felix Sun committed
Conflicts: common/lib/xmodule/xmodule/crowdsource_hinter.py