resolved cherry-pick conflicts
dev
1 parent 86c6e54 commit d138599df057bff7163b3effcf145cfe9e7e3f14
@briley briley authored on 8 Jun 2017
Brian Riley committed on 9 Jun 2017
Showing 6 changed files
View
app/views/home/index.html.erb
View
app/views/shared/_login_form.html.erb
View
app/views/shared/_register_form.html.erb
View
lib/assets/javascripts/roadmap-utils.js
View
lib/assets/stylesheets/roadmap-form.scss
View
lib/assets/stylesheets/roadmap-tabs.scss