2 commits

Author	SHA1	Message	Date
Tanguy PATTE	3f11e09937	fix tests	2015-09-24 11:20:04 +02:00
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