Xavier J c4e0e6b402 Merge branch 'develop' into leaflet_freedraw ... # Conflicts: # db/schema.rb		2015-11-19 17:29:23 +01:00
..
_infos_dossier.html.haml	add api_carto on back office and recapitulative page	2015-11-19 16:47:56 +01:00
_infos_entreprise.html.haml	Add on information entreprise :	2015-11-16 11:23:29 +01:00
_pieces_justificatives.html.haml	add api_carto on back office and recapitulative page	2015-11-19 16:47:56 +01:00
_show.html.haml	fix user path and add test full user path	2015-09-24 10:30:29 +02:00
show.html.haml	move controller into users folder	2015-09-23 19:20:03 +02:00