Xavier J c4e0e6b402 Merge branch 'develop' into leaflet_freedraw ... # Conflicts: # db/schema.rb		2015-11-19 17:29:23 +01:00
..
carto	First Commit	2015-08-10 11:05:06 +02:00
siade	Add on information entreprise :	2015-11-16 11:23:29 +01:00
tasks	First Commit	2015-08-10 11:05:06 +02:00