Merge pull request #10 from DMPRoadmap/master
reverted changes to user <--> org relationships
dev
commit d0f0ee4f8625c90d8e83bc3738e97a5db6698dbc
2 parents 522051c + df03bed
@Brian Riley Brian Riley authored on 9 Sep 2016
GitHub committed on 9 Sep 2016
Showing 5 changed files
View
app/models/organisation_type.rb
View
app/models/user.rb
View
config/locales/de.yml
View
config/locales/en-US.yml
View
config/locales/fr.yml