Xavier J 647eaa4ba8 Merge branch 'develop' into develop_v2 ... # Conflicts: # Gemfile.lock # db/schema.rb		2016-11-17 16:55:41 +01:00
..
migrate	Merge branch 'develop' into develop_v2	2016-11-17 16:55:41 +01:00
seeds	Fix seeds superadmin password changement	2016-08-22 12:37:24 +02:00
views	Rework searches to enable cross-table searches	2016-11-04 15:41:42 +01:00
schema.rb	Merge branch 'develop' into develop_v2	2016-11-17 16:55:41 +01:00
seeds.rb	[#880] New Data Base schema to manage the new procedure system	2015-09-21 11:38:14 +02:00