Merge branch 'CDL-MVP' of https://github.com/CDLUC3/roadmap into CDL-MVP
dev
commit 861d7b0450a51755ee773898d7ffb30ad78fa442
2 parents d684012 + 659c0f4
@Brian Riley Brian Riley authored on 15 Jun 2017
Showing 6 changed files
View
app/models/user.rb
View
app/views/devise/registrations/_personal_details.html.erb
View
app/views/devise/registrations/edit.html.erb
View
app/views/users/_notification_preferences.html.erb
View
lib/assets/stylesheets/roadmap-tabs.scss
View
lib/assets/stylesheets/roadmap.scss