Merge pull request #56 from DigitalCurationCentre/master

Fork: 0

opidor / dmpopidor

Browse code Merge pull request #56 from DigitalCurationCentre/master Latest changes from DCCRoadmap coming back dev
commit b74da740bcaf490efba6a8f86a9bfb85968adaa5 2 parents e5beeb5 + 2685cc5 Brian Riley authored on 2 Nov 2016 GitHub committed on 2 Nov 2016

Patch

Unified Split

Showing 6 changed files

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

Show notes View app/admin/user_org_role.rb 100644 → 0

Ignore Space Show notes View app/assets/javascripts/projects.js

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

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

Ignore Space Show notes View lib/tasks/migrate.rake

Show line notes below