Xavier J c4e0e6b402 Merge branch 'develop' into leaflet_freedraw ... # Conflicts: # db/schema.rb		2015-11-19 17:29:23 +01:00
..
carte_controller.rb	add api_carto on back office and recapitulative page	2015-11-19 16:47:56 +01:00
commentaires_controller.rb	force user login on commentaire	2015-09-24 10:34:01 +02:00
confirmations_controller.rb	[#884] add user	2015-09-23 10:02:01 +02:00
description_controller.rb	Dynamic display for champs on description and recapitulative page	2015-11-04 11:14:07 +01:00
dossiers_controller.rb	Add on information entreprise :	2015-11-16 11:23:29 +01:00
passwords_controller.rb	[#884] add user	2015-09-23 10:02:01 +02:00
recapitulatif_controller.rb	Dynamic display for champs on description and recapitulative page	2015-11-04 11:14:07 +01:00
registrations_controller.rb	[#884] add user	2015-09-23 10:02:01 +02:00
sessions_controller.rb	[#915] Revu de code Ok	2015-10-08 11:26:12 +02:00
siret_controller.rb	[#920] prefill siret when user has a siret	2015-10-08 11:22:55 +02:00
unlocks_controller.rb	[#884] add user	2015-09-23 10:02:01 +02:00