2 commits

Author	SHA1	Message	Date
Xavier J	f20f561e6c	Fix liens page description et recapitulatif	2015-09-24 11:37:18 +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