2 commits

Author	SHA1	Message	Date
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
Tanguy PATTE	5772b99d42	move controller into users folder	2015-09-23 19:20:03 +02:00

Renamed from app/controllers/recapitulatif_controller.rb (Browse further)