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	rename start controller into siret controller and change error handling	2015-09-23 16:56:30 +02:00
concerns	style check	2015-08-20 16:35:24 +02:00
gestionnaires	add login for gestionnaire	2015-09-22 10:15:12 +02:00
users	Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop	2015-09-24 10:56:12 +02:00
application_controller.rb	remove comment	2015-09-22 14:57:55 +02:00
backoffice_controller.rb	[#878] add liste of dossier in backoffice	2015-09-22 11:56:14 +02:00
carte_controller.rb	rename start controller into siret controller and change error handling	2015-09-23 16:56:30 +02:00
commentaires_controller.rb	[#883] move admin part in backoffice	2015-09-22 15:00:59 +02:00
dossiers_controller.rb	move controller into users folder	2015-09-23 19:20:03 +02:00
users_controller.rb	move controller into users folder	2015-09-23 19:20:03 +02:00