Xavier J c4e0e6b402 Merge branch 'develop' into leaflet_freedraw ... # Conflicts: # db/schema.rb		2015-11-19 17:29:23 +01:00
..
backoffice/dossiers	Creation three tabs for gestionnaire back office	2015-11-13 15:23:21 +01:00
dossiers	fix test	2015-11-19 17:23:51 +01:00
users	add api_carto on back office and recapitulative page	2015-11-19 16:47:56 +01:00