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

# Conflicts: # composer.json # composer.lock

Merge branches 'Centres-cout' and 'master' of git.unicaen.fr:open-source/OSE into Centres-cout
# Conflicts: # composer.json # composer.lock
558f2702 · Alexandre Zvenigorosky · 41e021b7 · 558f2702 · 558f2702 · 558f2702
Commit 558f2702 authored Jan 09, 2019 by Alexandre Zvenigorosky
--- a/CHANGELOG
+++ b/CHANGELOG
--- a/LICENSE
+++ b/LICENSE
--- a/code/Anonymisation.php
+++ b/code/Anonymisation.php
--- a/code/Contrôle des séquences.php
+++ b/code/Contrôle des séquences.php
--- a/code/Créer un utilisateur local.php
+++ b/code/Créer un utilisateur local.php
--- a/code/GenDbStructure.php
+++ b/code/GenDbStructure.php
--- a/code/GenDbStructure/DataGen.php
+++ b/code/GenDbStructure/DataGen.php
--- a/code/GenDbStructure/DdlGen.php
+++ b/code/GenDbStructure/DdlGen.php
--- a/code/Hiérarchie WF.php
+++ b/code/Hiérarchie WF.php
--- a/code/Liste des colonnes d'une vue.php
+++ b/code/Liste des colonnes d'une vue.php
--- a/code/NewEntityService.php
+++ b/code/NewEntityService.php
--- a/code/NewOseForm.php
+++ b/code/NewOseForm.php
--- a/code/Requêtes en cours.php
+++ b/code/Requêtes en cours.php
--- a/code/template/EntityService.php
+++ b/code/template/EntityService.php
--- a/code/template/EntityServiceFactory.php
+++ b/code/template/EntityServiceFactory.php
--- a/code/template/FormAwareTrait.php
+++ b/code/template/FormAwareTrait.php
--- a/code/template/HydratorAwareTrait.php
+++ b/code/template/HydratorAwareTrait.php
--- a/code/template/OseForm.php
+++ b/code/template/OseForm.php
--- a/code/template/ServiceAwareTrait.php
+++ b/code/template/ServiceAwareTrait.php
--- a/code/test1.php
+++ b/code/test1.php