Xavier J 647eaa4ba8 Merge branch 'develop' into develop_v2 ... # Conflicts: # Gemfile.lock # db/schema.rb		2016-11-17 16:55:41 +01:00
..
dossiers_controller_spec.rb	Merge branch 'develop' into develop_v2	2016-11-17 16:55:41 +01:00
procedures_controller_spec.rb	Fix Test spec/controllers/api/*.rb	2016-11-15 09:54:17 +01:00