merge postgresql -> master
dev
commit 2685cc5abe7c659c0e8bec6f3e9cc77adba58bd7
2 parents a1564f3 + ec17337
@Ray Carrick Ray Carrick authored on 2 Nov 2016
Showing 6 changed files
View
app/admin/user.rb
View
app/admin/user_org_role.rb 100644 → 0
View
app/assets/javascripts/projects.js
View
app/models/user.rb
View
app/views/layouts/_dmponline_navigation.html.erb
View
lib/tasks/migrate.rake