Xavier J 285d7c6fa0 Merge branch 'develop' into france_connect ... # Conflicts: # db/schema.rb		2015-10-08 16:54:21 +02:00
..
migrate	Merge branch 'develop' into france_connect	2015-10-08 16:54:21 +02:00
schema.rb	Merge branch 'develop' into france_connect	2015-10-08 16:54:21 +02:00
seeds.rb	[#880] New Data Base schema to manage the new procedure system	2015-09-21 11:38:14 +02:00