Xavier J 8693f4194c Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop ... Conflicts: app/views/users/recapitulatif/show.html.haml spec/features/recapitulatif_page/_commentaires_flux_spec.rb spec/features/recapitulatif_page/show_page_spec.rb		2015-09-24 10:56:12 +02:00
..
_infos_dossier.html.haml	Nouvelle organisation de la page récapitulatif	2015-09-24 10:17:59 +02:00
_infos_entreprise.html.haml	clean views	2015-08-20 16:04:36 +02:00
_pieces_justificatives.html.haml	Nouvelle organisation de la page récapitulatif	2015-09-24 10:17:59 +02:00
_show.html.haml	fix user path and add test full user path	2015-09-24 10:30:29 +02:00
show.html.haml	move controller into users folder	2015-09-23 19:20:03 +02:00