Browse code resolved cherry-pick conflicts dev
1 parent 8251c74 commit b3f71e50b6de28da6a0b16af9237bde292b5fa36 briley authored on 1 Jun 2017 Brian Riley committed on 9 Jun 2017

Showing 15 changed files

• app/views/devise/passwords/new.html.erb
• app/views/home/index.html.erb
• app/views/layouts/_signin_signout.html.erb
• app/views/layouts/application.html.erb
• app/views/shared/_accessible_input.html.erb
• app/views/shared/_login_form.html.erb
• config/application.rb
• db/schema.rb
• lib/assets/javascripts/devise/passwords/new.js
• lib/assets/javascripts/home/index.js
• lib/assets/javascripts/shared/login_form.js
• lib/assets/javascripts/shared/register_form.js
• lib/assets/stylesheets/roadmap-form.scss
• lib/assets/stylesheets/roadmap-hacks.scss
• lib/assets/stylesheets/roadmap.scss

Ignore Space Show notes View app/views/devise/passwords/new.html.erb

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

Ignore Space Show notes View app/views/layouts/_signin_signout.html.erb

Ignore Space Show notes View app/views/layouts/application.html.erb

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

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

Ignore Space Show notes View config/application.rb

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View lib/assets/javascripts/devise/passwords/new.js 0 → 100644

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

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

Ignore Space Show notes View lib/assets/javascripts/shared/register_form.js

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

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

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

Show line notes below