From: Jérôme Benoit Date: Sun, 25 Nov 2018 18:45:17 +0000 (+0100) Subject: Merge branch 'master' of git.piment-noir.org:Projet_Recherche_Operationnelle X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=781ed37030cda81d217eeec17dead7d658427e4e;hp=781ed37030cda81d217eeec17dead7d658427e4e;p=Projet_Recherche_Operationnelle.git Merge branch 'master' of git.piment-noir.org:Projet_Recherche_Operationnelle Signed-off-by: Jérôme Benoit ---