fixed merge conflict
dev
commit 38f87c3fc97fff29b0706b4dcf6658f86414e2ad
2 parents 899882c + 9351617
@Jose Lloret Jose Lloret authored on 22 Mar 2018
Showing 3 changed files
View
app/models/answer.rb
View
app/models/concerns/exportable_plan.rb
View
app/views/shared/export/_plan.erb