Commit 4346077e authored by Alexandre Zvenigorosky's avatar Alexandre Zvenigorosky
Browse files

Merge branches 'Centres-cout' and 'master' of git.unicaen.fr:open-source/OSE into Centres-cout 

# Conflicts:
#	composer.json
#	composer.lock
parent 1276867f

module/Application/config/modulateur.config.php

+760 −176

File changed.

Preview size limit exceeded, changes collapsed.

module/Application/src/Application/Controller/ModulateurController.php

+766 −193

File changed.

Preview size limit exceeded, changes collapsed.

module/Application/src/Application/Entity/Db/TypeFormation.php

+752 −176

File changed.

Preview size limit exceeded, changes collapsed.

module/Application/src/Application/Service/GroupeTypeFormationService.php

+762 −52

File changed.

Preview size limit exceeded, changes collapsed.

module/Application/src/Application/Service/TypeModulateurStructureService.php

+762 −118

File changed.

Preview size limit exceeded, changes collapsed.