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
..
show.html.haml	Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop	2015-09-24 10:56:12 +02:00