Merge pull request #14 from DMPRoadmap/master

Fork: 0

opidor / dmpopidor

Browse code Merge pull request #14 from DMPRoadmap/master rebase with DCC changes from the Nov. 1st sprint dev
commit 0eba08c079a96cc14d1c5c4fe9481c087bce196e 2 parents f8fe6d2 + b74da74 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