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
..
backoffice	Correction teste view	2015-09-24 10:42:14 +02:00
carte_page	- Correction des tests suite à la modification du schéma de la base de données.	2015-09-21 17:59:03 +02:00
description_page	move controller into users folder	2015-09-23 19:20:03 +02:00
recapitulatif_page	Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop	2015-09-24 10:56:12 +02:00
users	fix user path and add test full user path	2015-09-24 10:30:29 +02:00
datepicker_spec.rb	move controller into users folder	2015-09-23 19:20:03 +02:00