Tanguy PATTE d034176fe3 Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop ... Conflicts: app/views/dossiers/_infos_dossier.html.haml		2015-09-22 15:02:04 +02:00
..
show.html.haml	Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop	2015-09-22 15:02:04 +02:00