7107e3ee66756dc53420bab74a8243f0effaa183
Conflicts: cms/static/js/base.js
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%