Commit graph

7 commits

Author SHA1 Message Date
Mathieu Magnin
11c793a60c Remove custom button code, use bootstrap classes 2017-02-14 16:23:48 +01:00
Mathieu Magnin
82546a3ad4 Fix merge error 2017-02-08 15:32:49 +01:00
Xavier J
5edd16c30f Fix indentation 2017-02-07 17:52:56 +01:00
Xavier J
7cd08ec3f9 Merge branch 'develop' into print_css_for_dossier_show
# Conflicts:
#	app/views/dossiers/_messagerie.html.haml
2017-02-07 17:38:02 +01:00
Mathieu Magnin
e99746639b Merge branch 'send_user_notification_when_invite_send_a_message' into develop 2017-02-01 17:01:34 +01:00
Mathieu Magnin
34d05e4d9e Improve the print css for the dossier/show 2017-02-01 14:24:24 +01:00
Mathieu Magnin
38e8acf285 Change some wordings and clean some templates 2017-01-31 10:46:20 +01:00