Merge branch 'CDL-MVP' into branding
dev
commit 62415a9a92f2f54b91440553bf9533f5a92e6261
2 parents 357412e + 6d34385
@briley briley authored on 14 Jun 2017
Showing 9 changed files
View
app/controllers/registrations_controller.rb
View
app/models/user.rb
View
app/views/devise/registrations/_password_details.html.erb 0 → 100644
View
app/views/devise/registrations/_personal_details.html.erb 0 → 100644
View
app/views/devise/registrations/edit.html.erb
View
app/views/users/_notification_preferences.html.erb 0 → 100644
View
db/migrate/20170606215136_add_preferences_to_users.rb 0 → 100644
View
lib/assets/stylesheets/roadmap-tabs.scss
View
lib/assets/stylesheets/roadmap.scss