6ce300a3c801aeaff6f30ec2a77c41699e5a298c
Conflicts: cms/static/js/base.js cms/static/js/hesitate.js
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4
See doc/ for documentation.
Languages
Python
73.7%
JavaScript
15.4%
HTML
7.1%
SCSS
3.2%
CSS
0.5%