Browse code Merge pull request #24 from DMPRoadmap/development Merge latest PR from CDL across to DCC dev
commit d0cbbb6084ed773a2ce59bb92f88ed7460c5a923 2 parents 9189044 + e418aac Ray Carrick authored on 22 Mar 2017 GitHub committed on 22 Mar 2017

Showing 14 changed files

• Gemfile
• Gemfile.lock
• README.md
• app/controllers/phases_controller.rb
• app/controllers/templates_controller.rb
• config/initializers/recaptcha.rb.example
• public/github-contributor-infographic-final.png
• test/functional/answers_controller_test.rb
• test/functional/application_controller_test.rb
• test/functional/registrations_controller_test.rb
• test/functional/static_pages_controller_test.rb
• test/test_helper.rb
• test/unit/settings/plan_test.rb
• test/unit/settings/template_test.rb

Ignore Space Show notes View Gemfile

Ignore Space Show notes View Gemfile.lock

Ignore Space Show notes View README.md

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

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

Ignore Space Show notes View config/initializers/recaptcha.rb.example

Ignore Space Show notes View public/github-contributor-infographic-final.png 0 → 100644

Ignore Space Show notes View test/functional/answers_controller_test.rb

Ignore Space Show notes View test/functional/application_controller_test.rb

Ignore Space Show notes View test/functional/registrations_controller_test.rb

Ignore Space Show notes View test/functional/static_pages_controller_test.rb

Ignore Space Show notes View test/test_helper.rb

Ignore Space Show notes View test/unit/settings/plan_test.rb

Ignore Space Show notes View test/unit/settings/template_test.rb

Show line notes below