Merge branch 'dev'

This commit is contained in:
Simon Lehericey 2017-07-12 16:31:59 +02:00
commit 7f10900d62
2 changed files with 2 additions and 2 deletions

View file

@ -52,7 +52,7 @@
- elsif champ.decorate.value == 'false'
Non
- else
= champ.decorate.value.html_safe
= sanitize(champ.decorate.value)
- if @facade.dossier.mandataire_social && gestionnaire_signed_in?
.mandataire_social.text-success.center

View file

@ -2,7 +2,7 @@
.comment-header
= commentaire.header
.content
= commentaire.body.html_safe
= sanitize(commentaire.body)
- if file = commentaire.piece_justificative
.file
= link_to file.content_url, class: 'link', target: '_blank' do