Browse code fixed merge conflicts dev
commit c1454c33512803c4862c3b5f5921a3888ea8e99c 2 parents e963318 + 0abcf04 briley authored on 8 Nov 2016

Showing 16 changed files

• README.md
• app/controllers/registrations_controller.rb
• app/controllers/sessions_controller.rb
• app/controllers/users/omniauth_callbacks_controller.rb
• app/models/user.rb
• config/locales/de.yml
• config/locales/en-UK.yml
• config/locales/en-US.yml
• config/locales/fr.yml
• config/routes.rb
• db/migrate/20161104161345_remove_logo_from_identifier_schemes.rb
• db/schema.rb
• db/seeds.rb
• test/fixtures/identifier_schemes.yml
• test/functional/users/omniauth_callbacks_controller_test.rb
• test/routing_test.rb

Ignore Space Show notes View README.md

Ignore Space Show notes View app/controllers/registrations_controller.rb

Ignore Space Show notes View app/controllers/sessions_controller.rb

Ignore Space Show notes View app/controllers/users/omniauth_callbacks_controller.rb

Ignore Space Show notes View app/models/user.rb

Ignore Space Show notes View config/locales/de.yml

Ignore Space Show notes View config/locales/en-UK.yml

Ignore Space Show notes View config/locales/en-US.yml

Ignore Space Show notes View config/locales/fr.yml

Ignore Space Show notes View config/routes.rb

Ignore Space Show notes View db/migrate/20161104161345_remove_logo_from_identifier_schemes.rb 0 → 100644

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View db/seeds.rb

Ignore Space Show notes View test/fixtures/identifier_schemes.yml 0 → 100644

Ignore Space Show notes View test/functional/users/omniauth_callbacks_controller_test.rb 0 → 100644

Ignore Space Show notes View test/routing_test.rb

Show line notes below