Merge branch 'postgresql' of https://github.com/DigitalCurationCentre/roadmap into postgresql
dev
commit c43e71679d5dc9982be39b2e84a35d7b8a9dcc32
2 parents 08b84d5 + 0aafbb4
@Jimmy Angelakos Jimmy Angelakos authored on 25 Oct 2016
Showing 5 changed files
View
app/controllers/users_controller.rb
View
app/models/organisation.rb
View
app/models/user.rb
View
app/views/plans/_answer_form.html.erb
View
db/migrate/20161021100420_single_organisation_for_users.rb 0 → 100644