Browse code Merge branch 'master' into dmptool dev
commit c1cf8a36f356d0a191c9a5090a3b30e4467aa5af 2 parents e23e48b + 04005bc briley authored on 8 Aug 2016

Showing 24 changed files

• Gemfile
• app/assets/images/logo.jpg
• app/assets/images/uc3_logo.jpg
• app/views/contact_us/contacts/new.html.erb
• app/views/home/index.html.erb
• app/views/layouts/_dmponline_footer.html.erb
• app/views/layouts/application.html.erb
• app/views/static_pages/about_us.html.erb
• app/views/static_pages/help.html.erb
• app/views/static_pages/roadmap.html.erb
• app/views/static_pages/termsuse.html.erb
• config.ru
• config/application.rb
• config/branding.yml
• config/environment/development.rb
• config/initializers/locale.rb
• config/locales/bootstrap/en-UK.bootstrap.yml
• config/locales/bootstrap/en-US.bootstrap.yml
• config/locales/contact_us/contact_us.en-UK.yml
• config/locales/contact_us/contact_us.en-US.yml
• config/locales/devise/devise_invitable.en-UK.yml
• config/locales/devise/devise_invitable.en-US.yml
• config/locales/en-UK.yml
• config/locales/en-US.yml

Ignore Space Show notes View Gemfile

Ignore Space Show notes View app/assets/images/logo.jpg

Ignore Space Show notes View app/assets/images/uc3_logo.jpg 0 → 100644

Ignore Space Show notes View app/views/contact_us/contacts/new.html.erb

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

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

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

Ignore Space Show notes View app/views/static_pages/about_us.html.erb

Ignore Space Show notes View app/views/static_pages/help.html.erb

Ignore Space Show notes View app/views/static_pages/roadmap.html.erb

Ignore Space Show notes View app/views/static_pages/termsuse.html.erb

Ignore Space Show notes View config.ru

Ignore Space Show notes View config/application.rb

Ignore Space Show notes View config/branding.yml 0 → 100644

Show notes View config/environment/development.rb 100644 → 0

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

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

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

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

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

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

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

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

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

Show line notes below