2436d59e14636d5edf3d60a79396ff4e1ab2a0ed
Conflicts: cms/djangoapps/contentstore/tests/factories.py lms/djangoapps/courseware/tests/test_access.py
Remove the specific version of ruby here because it's breaking the dev scripts amongst other things.
See doc/ for documentation.
Languages
Python
73.7%
JavaScript
15.4%
HTML
7.1%
SCSS
3.2%
CSS
0.5%