Commit 63e5ae87 authored Oct 10, 2018 by Alexandre Zvenigorosky

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

# Conflicts:
#	composer.json
#	composer.lock

parent 4346077e

module/Application/config/modulateur.config.php

+175 −760

File changed.

Preview size limit exceeded, changes collapsed.

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

+188 −766

File changed.

Preview size limit exceeded, changes collapsed.

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

+176 −752

File changed.

Preview size limit exceeded, changes collapsed.

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

+32 −762

File changed.

Preview size limit exceeded, changes collapsed.

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

+46 −762

File changed.

Preview size limit exceeded, changes collapsed.