Browse code fixed merge conflict in schema.rb dev
commit 67c35e7edf4c9397189d14489025a2579f90dd39 2 parents 8fe7792 + d191694 Brian Riley authored on 12 Aug 2016

Showing 12 changed files

• .gitignore
• Gemfile
• Gemfile.lock
• app/controllers/organisations_controller.rb
• app/models/organisation.rb
• app/views/layouts/_dmponline_header.html.erb
• app/views/organisations/admin_edit.html.erb
• app/views/organisations/admin_show.html.erb
• config/initializers/dragonfly.rb
• config/locales/en-UK.yml
• db/migrate/20160810193149_add_logouid_to_organisations.rb
• db/schema.rb

Ignore Space Show notes View .gitignore

Ignore Space Show notes View Gemfile

Ignore Space Show notes View Gemfile.lock

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

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

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

Ignore Space Show notes View app/views/organisations/admin_edit.html.erb

Ignore Space Show notes View app/views/organisations/admin_show.html.erb

Ignore Space Show notes View config/initializers/dragonfly.rb 0 → 100644

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

Ignore Space Show notes View db/migrate/20160810193149_add_logouid_to_organisations.rb 0 → 100644

Ignore Space Show notes View db/schema.rb

Show line notes below