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
..
controllers	move controller into users folder	2015-09-23 19:20:03 +02:00
decorators	Nouvelle organisation de la page récapitulatif	2015-09-24 10:17:59 +02:00
factories	Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop	2015-09-24 10:56:12 +02:00
features	Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop	2015-09-24 10:56:12 +02:00
lib/siade	style check	2015-08-20 17:30:17 +02:00
models	Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop	2015-09-24 10:56:12 +02:00
support	remove blank lines	2015-09-22 10:16:06 +02:00
views	Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop	2015-09-24 10:56:12 +02:00
rails_helper.rb	fix datepicker and test it	2015-08-24 11:42:06 +02:00
spec_helper.rb	Nouvelle organisation de la page récapitulatif	2015-09-24 10:17:59 +02:00