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_spec.rb	Correction teste view	2015-09-24 10:42:14 +02:00
_infos_entreprise_spec.rb	[#876] New home page and disabled liste démarche and cargo	2015-09-21 11:36:26 +02:00
show.html.haml_spec.rb	move controller into users folder	2015-09-23 19:20:03 +02:00