Browse code fixed merge conflict with schema.rb dev
commit 83fb27e444f573991f527dcbddeda2983e0189dc 2 parents 6f6e89a + 5c687e2 Brian Riley authored on 12 Aug 2016

Showing 15 changed files

• .travis.yml
• Gemfile
• Gemfile.lock
• app/admin/user_role_type.rb
• app/admin/user_status.rb
• app/assets/stylesheets/admin.css.less
• app/assets/stylesheets/bootstrap_and_overrides.css.less
• app/controllers/dmptemplates_controller.rb
• config/environments/development.rb
• config/environments/test.rb
• config/initializers/locale.rb
• db/migrate/20130903123015_create_friendly_id_slugs.rb
• db/migrate/20140604092907_rails_settings_migration.rb
• db/schema.rb
• db/seeds.rb

Ignore Space Show notes View .travis.yml

Ignore Space Show notes View Gemfile

Ignore Space Show notes View Gemfile.lock

Ignore Space Show notes View app/admin/user_role_type.rb

Ignore Space Show notes View app/admin/user_status.rb

Ignore Space Show notes View app/assets/stylesheets/admin.css.less

Ignore Space Show notes View app/assets/stylesheets/bootstrap_and_overrides.css.less

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

Ignore Space Show notes View config/environments/development.rb

Ignore Space Show notes View config/environments/test.rb

Ignore Space Show notes View config/initializers/locale.rb

Ignore Space Show notes View db/migrate/20130903123015_create_friendly_id_slugs.rb

Ignore Space Show notes View db/migrate/20140604092907_rails_settings_migration.rb

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View db/seeds.rb

Show line notes below