Commit 6917b9e7 authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge branch 'refs/heads/b24'

# Conflicts:
#	composer.json
#	composer.lock
#	data/ddl_columns_pos.php
#	front/Formule/Test/Test.vue
#	module/Application/src/Entity/WorkflowEtape.php
#	module/Contrat/src/Controller/ContratController.php
#	module/Intervenant/src/Entity/Db/Intervenant.php
#	module/OffreFormation/src/Service/ElementPedagogiqueService.php
#	public/dist/.vite/manifest.json
#	public/dist/assets/main-jFf4OOQq.css
parents eb5d0ce6 ff762d45
Loading
Loading
Loading
Loading