Merge pull request #1388 from DMPRoadmap/master

Fork: 0

opidor / dmpopidor

Browse code Merge pull request #1388 from DMPRoadmap/master Merging in latest bug fixes dev
commit bc0f5b02a3eea5a256422e6db982128001d9b939 2 parents d0e7a11 + 8856060 Brian Riley authored on 17 Apr 2018 GitHub committed on 17 Apr 2018

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View app/controllers/contacts_controller.rb 0 → 100644

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

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

Ignore Space Show notes View test/unit/org_test.rb

Show line notes below