Xavier J c4e0e6b402 Merge branch 'develop' into leaflet_freedraw ... # Conflicts: # db/schema.rb		2015-11-19 17:29:23 +01:00
..
images	Logo france connect navbar	2015-10-08 12:11:01 +02:00
javascripts	delete rails-bower	2015-11-19 17:20:22 +01:00
stylesheets	Merge branch 'develop' into leaflet_freedraw	2015-11-19 17:29:23 +01:00