Conflicts:
	composer.json
	composer.lock
	data/ddl/table/TYPE_PIECE_JOINTE_STATUT.php
	data/ddl/view/V_INDICATEUR_380.sql
	module/Application/src/Controller/StatutIntervenantController.php
	module/Application/src/Entity/Db/Mapping/Application.Entity.Db.TypePieceJointeStatut.dcm.xml
	module/Application/src/Entity/Db/TypePieceJointeStatut.php
	module/Application/src/Traits/ObligatoireSelonSeuilHeuresTrait.php
	module/Application/view/application/statut-intervenant/index.phtml