dd20226ec3df99a8bdd6d0d0dd9cf5f4e44eec53
Fix some merge issues involving rubric rendering Conflicts: common/lib/xmodule/xmodule/combined_open_ended_rubric.py common/lib/xmodule/xmodule/open_ended_module.py common/lib/xmodule/xmodule/self_assessment_module.py
version is required http://gembundler.com/man/gemfile.5.html, this was causing rvm to return non-zero and thus causing the create-dev-env.sh script to fail
See doc/ for documentation.
Languages
Python
73.7%
JavaScript
15.4%
HTML
7.1%
SCSS
3.2%
CSS
0.5%