Commit 43763661 authored by Théo GUILLON's avatar Théo GUILLON
Browse files

Merge remote-tracking branch...

Merge remote-tracking branch 'origin/96-ajouter-la-possibiliter-de-rajouter-plusieurs-sous-traitants-lors-de-la-declaration-d-un' into 96-ajouter-la-possibiliter-de-rajouter-plusieurs-sous-traitants-lors-de-la-declaration-d-un

# Conflicts:
#	app/Config/Schema/CreationBase/patchs/1.1.0_to_1.2.0.sql
#	app/Controller/FichesController.php
#	app/Model/Coresponsable.php
#	app/View/Elements/Fiches/tabs/coresponsable.ctp
parents 4fcdb3e5 7dbb2399
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment