Browse code resolved cherry-pick conflicts dev
1 parent 0479977 commit bd1bc70397cb62ad55236098bb6aad15bf666690 briley authored on 17 May 2017 Brian Riley committed on 9 Jun 2017

Showing 12 changed files

• app/views/home/index.html.erb
• app/views/shared/_accessible_input_email.html.erb
• app/views/shared/_accessible_submit_button.html.erb
• app/views/shared/_login_form.html.erb
• app/views/shared/_register_form.html.erb
• config/application.rb
• db/migrate/20170516184429_add_recovery_email_to_users.rb
• db/schema.rb
• lib/assets/javascripts/application.js
• lib/assets/javascripts/registrations/sign_in_sign_up.js
• lib/assets/javascripts/roadmap.js
• lib/assets/stylesheets/roadmap-form.scss

Ignore Space Show notes View app/views/home/index.html.erb

Ignore Space Show notes View app/views/shared/_accessible_input_email.html.erb 0 → 100644

Ignore Space Show notes View app/views/shared/_accessible_submit_button.html.erb

Ignore Space Show notes View app/views/shared/_login_form.html.erb

Ignore Space Show notes View app/views/shared/_register_form.html.erb

Ignore Space Show notes View config/application.rb

Ignore Space Show notes View db/migrate/20170516184429_add_recovery_email_to_users.rb 0 → 100644

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View lib/assets/javascripts/application.js

Ignore Space Show notes View lib/assets/javascripts/registrations/sign_in_sign_up.js 0 → 100644

Ignore Space Show notes View lib/assets/javascripts/roadmap.js 0 → 100644

Ignore Space Show notes View lib/assets/stylesheets/roadmap-form.scss

Show line notes below