Xavier J c4e0e6b402 Merge branch 'develop' into leaflet_freedraw ... # Conflicts: # db/schema.rb		2015-11-19 17:29:23 +01:00
..
migrate	Merge branch 'develop' into leaflet_freedraw	2015-11-19 17:29:23 +01:00
schema.rb	Add on information entreprise :	2015-11-16 11:23:29 +01:00
seeds.rb	[#880] New Data Base schema to manage the new procedure system	2015-09-21 11:38:14 +02:00